Add concept of admin
Merge branch 'add-concept-of-admin'