Changed Teacher to Administrator
Merge branch 'Bas' of https://github.com/utwente-di/di14 into Bas
Merge branch 'Bas'