Admin
Moar admin
Admin fixez
Merge branch 'master' into development

Admin fixes
Final admin settings