Merge remote-tracking branch 'origin/support/3.0' into develop

# Conflicts:
#	core/config.class.inc.php

approot.inc.php

@@ -4,7 +4,10 @@ define('APPROOT', dirname(__FILE__).'/');
 define('APPCONF', APPROOT.'conf/');
 
 /**
- * iTop framework Version
+ * iTop Datamodel XML format version
+ * And also iTop core version
+ *
+ * To test for iTop core version use this constant instead of {@link ITOP_VERSION} !
  */
 define('ITOP_DESIGN_LATEST_VERSION', '3.1');