Merge branch 'develop'

Changelog

 FusionDirectory changelog
 =========================
 
+* FusionDirectory 1.0.6
+
+Bugs #2136: check that on centos fusiondirectory-setup use the correct user for /var/cache/fusiondirectory stuff
+Bugs #2157: Incohérence sur la déclaration du workgroup samba
+Bugs #2304: when i select users i see windows workstations appearing in object groups
+Bugs #2336: kolab2 schema failed insertion
+Bugs #2346: Fusiondirectory 1.0.5 + wheezy + user management
+Bugs #2349: the dsa plugin should allow to select the password encoding method
+Bugs #2350: when i save a mail group i got a not needed gosaMailDelivery mode saved
+Bugs #2351: case of forcePasswordDefaultHash
+Bugs #2352: dsaManagement should use simpleManagement
+Bugs #2355: Severities in the FDstandard codesniffer standard should be set
+Bugs #2356: all checkbox=$multiple_support should be remove from the smarty templates
+Bugs #2357: all checkbox=$multiple_support should be remove from the smarty templates
+Bugs #2361: Login uses simple quotes for translated strings in smarty template
+Bugs #2362: remove the update schema from 1.0.4 for 1.0.6
+Bugs #2364: remove the update schema from 1.0.4 for 1.0.6
+Bugs #2365: remove the remaning readme into the plugins
+Bugs #2371: fusiondirectory-insert-schema should look for the right name
+Bugs #2374: the ldapFollowReferrals should be in fusiondirectory.conf.pod as it is a file config option
+Bugs #2377: config directory incorrect for the samba plugin
+simple-plugin - Bugs #2360: simpleManagement should allow to select an other list or filter xml file
+
 * FusionDirectory 1.0.5
 
 [Fix] Bugs #216: Missing translation on the index.php file

include/variables_common.inc

@@ -74,7 +74,7 @@ define("SMARTY3", "/usr/share/php/smarty3/Smarty.class.php"); /*! Define smarty3
 /*!
  * \brief FusionDirectory Version
  */
-define ("FD_VERSION", "1.0.6-dev"); /*! Define FusionDirectory version */
+define ("FD_VERSION", "1.0.6"); /*! Define FusionDirectory version */
 
 /*!
  * \brief FusionDirectory config object RDN