admin views
Merge branch 'master' of github.com:sixtonspacefly/OSIRIS