Added admin
Merge branch 'master' of https://github.com/ohemorange/gsr14