Added admin field to users table
Merge branch 'dev'