Working on why DaveT isn't able to issue permission numbers

Added some logging and fixed a couple of bugs in giving feedback.
Merge branch 'AuthLosesForms' into dev
Minor changes

* Add service incidator reason code (request of Riley)
* Change format of term in courseselect tab (request of Dave T)
Refactor Users to more clearly separate roles, permissions, and preferences.
Refactor Users to more clearly separate roles.

Also cleaned up a couple of misc. messages.
Merge branch 'Refactor-Users' into dev
Merge branch 'dev' of https://github.com/bwbecker/oat into dev

Conflicts:
	app/views/queries/index.scala.html
All tags done without errors