Conflicts:
	html/index.php
	html/main.php
	html/setup.php
	html/themes/default/tabs.css
	ihtml/themes/default/headers.tpl
	ihtml/themes/default/msg_dialog.tpl
	ihtml/themes/default/simple-filter.tpl
	ihtml/themes/default/simple-remove.tpl
	include/class_acl.inc
	include/class_divSelectBox.inc
	include/class_divlist.inc
	include/class_sortableListing.inc
	include/class_tabs.inc
	include/functions_debug.inc
	include/php_setup.inc
	include/simpleplugin/systemSelect/systemSelect-filter.tpl
	plugins/admin/departments/class_department.inc
	plugins/admin/departments/country.tpl
	plugins/admin/departments/dcObject.tpl
	plugins/admin/departments/dep-filter.tpl
	plugins/admin/departments/dep_move_confirm.tpl
	plugins/admin/departments/domain.tpl
	plugins/admin/departments/generic.tpl
	plugins/admin/departments/locality.tpl
	plugins/admin/departments/organization.tpl
	plugins/admin/departments/remove.tpl
	plugins/admin/ogroups/class_ogroup.inc
	plugins/admin/ogroups/ogroup-filter.tpl