tezt
reezse
Merge branch 'developer' of https://github.com/TamoMaez/Competentietester into developer

Conflicts:
	bin/controller/AdminModeAction.class