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

Move this trailing comment on the previous empty line

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

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

Conflicts:
	include/class_acl.inc
	include/simpleplugin/class_simplePlugin.inc
	plugins/admin/groups/class_groupManagement.inc

Also improved --migrate-users

Conflicts:
	setup/class_setup.inc
	setup/class_setupStep_Finish.inc

Conflicts:
	plugins/config/class_configInLdap.inc
	setup/class_setupStep_Migrate.inc

Also fixed an error in check_defaultACLs

Still to do:
add vars to the beginning of the class
check that migrations works
create admin role in top of admin user
add migration features for outsideUsers, outsideGroups and organizationalUnits

Conflicts:
	setup/class_setupStep_Migrate.inc
	setup/setup_migrate.tpl

Conflicts:
	setup/class_setupStep_Checks.inc
	setup/class_setupStep_Finish.inc
	setup/class_setupStep_Language.inc
	setup/class_setupStep_Ldap.inc
	setup/class_setupStep_Migrate.inc

Conflicts:
	html/themes/default/setup.css
	plugins/config/class_configInLdap.inc
	setup/class_setupStep_Checks.inc
	setup/class_setupStep_Config1.inc
	setup/class_setupStep_Config2.inc
	setup/class_setupStep_Config3.inc
	setup/class_setupStep_Finish.inc
	setup/class_setupStep_Language.inc
	setup/class_setupStep_Ldap.inc
	setup/class_setupStep_Migrate.inc
	setup/class_setupStep_Welcome.inc
	setup/setup_checks.tpl
	setup/setup_config1.tpl
	setup/setup_config2.tpl
	setup/setup_finish.tpl
	setup/setup_frame.tpl
	setup/setup_welcome.tpl

Conflicts:
	include/class_certificate.inc
	include/class_session.inc