Made Grimling an admin again
Merge branch 'develop' into duggasys-master
Merge branch 'duggasys-master' into duggasys-feature-login-system-#93