Merge origin/bootstrap3 and fix conflicts
WIP on admin user management