Merge branch 'hotfix-live'
Version bumped to 2.1.10
Added an "admin" flag to users.
Merge branch 'hotfix-2.1.10' into develop