Merge branch '1.1'

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>

Conflicts:
	.tx/config
	Changelog
	contrib/bin/fusiondirectory-insert-schema
	contrib/bin/fusiondirectory-setup
	contrib/docs/UPGRADE
	contrib/man/fusiondirectory-insert-schema.1
	contrib/man/fusiondirectory-setup.1
	contrib/man/fusiondirectory.conf.5
	contrib/man/fusiondirectory.conf.pod
	contrib/openldap/core-fd-conf.schema
	contrib/openldap/core-fd.schema
	contrib/smarty/plugins/block.render.php
	contrib/smarty/plugins/function.msgPool.php
	html/autocomplete.php
	html/class_passwordRecovery.inc
	html/getbin.php
	html/geticon.php
	html/include/pulldown.js
	html/index.php
	html/setup.php
	html/themes/breezy/dialog.css
	html/themes/breezy/lists.css
	html/themes/breezy/style.css
	html/themes/legacy/lists.css
	html/themes/legacy/style.css
	ihtml/themes/breezy/framework.tpl
	ihtml/themes/breezy/msg_dialog.tpl
	ihtml/themes/breezy/simple-list.tpl
	include/accept-to-gettext.inc
	include/class_CopyPasteHandler.inc
	include/class_IconTheme.inc
	include/class_SnapshotDialogs.inc
	include/class_SnapshotHandler.inc
	include/class_baseSelector.inc
	include/class_config.inc
	include/class_departmentSortIterator.inc
	include/class_filter.inc
	include/class_filterLDAP.inc
	include/class_ldap.inc
	include/class_listing.inc
	include/class_listingSortIterator.inc
	include/class_logging.inc
	include/class_management.inc
	include/class_msgPool.inc
	include/class_msg_dialog.inc
	include/class_objects.inc
	include/class_plugin.inc
	include/class_pluglist.inc
	include/class_session.inc
	include/class_template.inc
	include/class_tests.inc
	include/class_userinfo.inc
	include/class_xml.inc
	include/functions.inc
	include/functions_debug.inc
	include/password-methods/class_password-methods-sasl.inc
	include/password-methods/class_password-methods-sha.inc
	include/password-methods/class_password-methods-ssha.inc
	include/password-methods/class_password-methods.inc
	include/select/class_filterLDAPBlacklist.inc
	include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
	include/simpleplugin/attributes/class_BooleanAttribute.inc
	include/simpleplugin/attributes/class_FileAttribute.inc
	include/simpleplugin/attributes/class_SetAttribute.inc
	include/simpleplugin/attributes/class_StringAttribute.inc
	include/simpleplugin/class_Attribute.inc
	include/simpleplugin/class_multiPlugin.inc
	include/simpleplugin/class_simpleManagement.inc
	include/simpleplugin/class_simplePlugin.inc
	include/simpleplugin/class_simpleSelectManagement.inc
	include/simpleplugin/class_simpleTabs.inc
	include/variables_common.inc
	locale/ar/fusiondirectory.po
	locale/ca/fusiondirectory.po
	locale/cs_CZ/fusiondirectory.po
	locale/de/fusiondirectory.po
	locale/el_GR/fusiondirectory.po
	locale/en/fusiondirectory.po
	locale/es/fusiondirectory.po
	locale/es_CO/fusiondirectory.po
	locale/es_VE/fusiondirectory.po
	locale/fa_IR/fusiondirectory.po
	locale/fi_FI/fusiondirectory.po
	locale/fr/fusiondirectory.po
	locale/hu_HU/fusiondirectory.po
	locale/id/fusiondirectory.po
	locale/it_IT/fusiondirectory.po
	locale/lv/fusiondirectory.po
	locale/nb/fusiondirectory.po
	locale/nl/fusiondirectory.po
	locale/pl/fusiondirectory.po
	locale/pt/fusiondirectory.po
	locale/pt_BR/fusiondirectory.po
	locale/ru/fusiondirectory.po
	locale/ru@petr1708/fusiondirectory.po
	locale/sv/fusiondirectory.po
	locale/ug/fusiondirectory.po
	locale/vi_VN/fusiondirectory.po
	locale/zh/fusiondirectory.po
	plugins/addons/dashboard/class_dashBoard.inc
	plugins/addons/dashboard/class_dashBoardUsers.inc
	plugins/addons/dashboard/groups_stats.tpl
	plugins/addons/dashboard/pwd_stats.tpl
	plugins/addons/dashboard/users_accounts.tpl
	plugins/addons/dashboard/users_stats.tpl
	plugins/admin/acl/class_aclAssignment.inc
	plugins/admin/acl/class_aclManagement.inc
	plugins/admin/departments/class_department.inc
	plugins/admin/departments/class_departmentManagement.inc
	plugins/admin/departments/class_locality.inc
	plugins/admin/departments/main.inc
	plugins/admin/departments/tabs_department.inc
	plugins/admin/groups/class_group.inc
	plugins/admin/groups/class_groupManagement.inc
	plugins/admin/groups/class_ogroup.inc
	plugins/admin/groups/group-filter.xml
	plugins/admin/groups/tabs_ogroups.inc
	plugins/admin/users/class_userManagement.inc
	plugins/admin/users/main.inc
	plugins/admin/users/user-filter.tpl
	plugins/admin/users/user-filter.xml
	plugins/config/class_configInLdap.inc
	plugins/config/tabs_configInLdap.inc
	plugins/generic/welcome/main.inc
	plugins/personal/generic/class_user.inc
	plugins/personal/posix/class_posixAccount.inc
	plugins/personal/roles/class_userRoles.inc
	setup/class_setup.inc
	setup/class_setupStep.inc
	setup/class_setupStepChecks.inc
	setup/class_setupStepWelcome.inc
	setup/class_setupStep_Finish.inc
	setup/class_setupStep_Language.inc
	setup/class_setupStep_Ldap.inc
	setup/class_setupStep_Migrate.inc