some stuff
Merge branch 'admin' of github.com:utwente-di/di10 into admin