Removed Admin model, added attribute to User
Merge branch 'beta'