Made Grimling an admin again
Merge branch 'develop' into codeviewer-master