fix bugs and admin
Merge branch 'master' of github.com:BlackSheepAgency/BlackSheep
fix bugs and admin