acl-changes
Merge branch 'taskoverview' of github.com:MittagQI/translate5ZfModule into taskoverview

Conflicts:
	configs/aclConfig.ini
Merge branch 'taskoverview' of github.com:MittagQI/translate5ZfModule into taskoverview