UsersController updated so you can now select from dropdownboxes
Merge origin/master