Merge branch 'f/translator' of https://github.com/waaghals/Tainted-Aberrant-Lion into f/Clippy

Conflicts:
	Classes/PROJ/Controllers/TestdataController.php
	nbproject/private/private.xml
Clippy transtaald
Merge branch 'dev' into f/Clippy

Conflicts:
	Classes/PROJ/Controllers/TestdataController.php
fixed merge error
Deleted Proxy
Merge branch 'f/Clippy' into dev