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