diff --git a/htdocs/conf/conf.class.php b/htdocs/conf/conf.class.php
index b1d76443135..aa0e46bfad6 100644
--- a/htdocs/conf/conf.class.php
+++ b/htdocs/conf/conf.class.php
@@ -21,18 +21,19 @@
  */
 
 /**
-   \file       	htdocs/conf/conf.class.php
-   \brief      	Fichier de la classe de stockage de la config courante
-   \remarks		La config est stockee dans le fichier conf/conf.php
-   \version    	$Id$
-*/
+ *	\file       	htdocs/conf/conf.class.php
+ *	\ingroup		core
+ *  \brief      	Fichier de la classe de stockage de la config courante
+ *  \remarks		La config est stockee dans le fichier conf/conf.php
+ *  \version    	$Id$
+ */
 
 
 /**
-   \class      Conf
-   \brief      Classe de stockage de la config courante
-   \todo       Deplacer ce fichier dans htdocs/lib
-*/
+ *  \class      Conf
+ *  \brief      Classe de stockage de la config courante
+ *  \todo       Deplacer ce fichier dans htdocs/lib
+ */
 class Conf
 {
     /** \public */
@@ -67,7 +68,7 @@ class Conf
 	var $monnaie;
 	var $css;
 	var $css_modules=array();
-
+	
 
 	/**
 	*      \brief      Positionne toutes les variables de configuration
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index f77496abc75..74324fdc4ad 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -25,7 +25,7 @@
 /**
  *	\file       htdocs/main.inc.php
  *	\ingroup	core
- *	\brief      Fichier de formatage generique des ecrans Dolibarr
+ *	\brief      File that defines environment for Dolibarr pages only (variables not required by scripts)
  *	\version    $Id$
  */
 
@@ -132,7 +132,7 @@ if ($conf->main_force_https)
 	}
 }
 
-// Chargement des includes complementaire de presentation
+// Chargement des includes complementaires de presentation
 if (! defined('NOREQUIREMENU')) require_once(DOL_DOCUMENT_ROOT ."/menu.class.php");			// Need 11ko memory (11ko in 2.2)
 if (! defined('NOREQUIREHTML')) require_once(DOL_DOCUMENT_ROOT ."/html.form.class.php");	// Need 690ko memory (800ko in 2.2)
 if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once(DOL_DOCUMENT_ROOT.'/lib/ajax.lib.php');	// Need 20ko memory
@@ -145,6 +145,17 @@ session_name($sessionname);
 session_start();
 dolibarr_syslog("Start session name=".$sessionname." Session id()=".session_id().", _SESSION['dol_login']=".$_SESSION["dol_login"].", ".ini_get("session.gc_maxlifetime"));
 
+// Disable modules (this must be after session_start)
+if (! empty($_REQUEST["disablemodules"])) $_SESSION["disablemodules"]=$_REQUEST["disablemodules"];
+if (! empty($_SESSION["disablemodules"])) 
+{
+	$disabled_modules=split(',',$_SESSION["disablemodules"]);
+	foreach($disabled_modules as $module)
+	{
+		$conf->$module->enabled=false;
+	}
+}
+
 /*
  * Phase identification
  */
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index d9c257ffccd..8c3bc5efac3 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -24,10 +24,11 @@
  */
 
 /**
-   \file       htdocs/master.inc.php
-   \brief      File that define environment for install pages
-   \version    $Id$
-*/
+ *	\file       htdocs/master.inc.php
+ * 	\ingroup	core
+ *  \brief      File that defines environment for all Dolibarr process (pages or scripts)
+ *  \version    $Id$
+ */
 
 define('DOL_VERSION','2.5-dev');	// Also defined in htdocs/install/inc.php
 define('EURO',chr(128));