Admin can add user
Admin/users_controller.rb showing as 'untracked'
Merge branch 'master' into admin-dashboard-users
Admin can now create admin users, overriding default user role
Admin can edit his/her personal info and change user's role
fix tests