added admin
Merge branch 'add_admin' into develop