corrected admin_layout check
Merge branch 'master' into add-crud-for-user-stuff