modified admin
Merge branch 'master' of https://github.com/carvey/rotc_logistics