Merge branch 'dev' into permNumbers
Checkpoint work on permission numbers

Substantial work on query to choose a permission number and assign it
to a specific student.
Merge branch 'dev' of https://github.com/bwbecker/oat into dev

Conflicts:
	app/controllers/Asis.scala
	conf/application.conf
Rework startup script

to do a better job of specifying which database to use.
Merge branch 'databaseconfig' into permNumbers
Merge branch 'databaseconfig' into dev
Do a better job of rendering menus based on the users permissions.
Merge branch 'menus' into permNumbers
Error messages for forms; photos

Added error/message handling to the main ASIS page.
Added error messages for notes and permission number forms.

Someplace serving photos slipped in, as well.
Update gitignore to ignore the testdb photos
Merge branch 'menus' into dev

Conflicts:
	app/models/User.scala
	app/views/Menu.scala
Merge branch 'permNumbers' into dev

Conflicts:
	.gitignore
	app/assets/stylesheets/main.less
Allow a Root user the limited ability to impersonate another user.
Complete the impersonation code

Store userid of person we're impersonating in the session because query
parameters don't survive redirection.
Merge branch 'impersonate' into dev
A bunch of small fixes.

Extended tooltips for current and future courses were wrong with the
reversed sort order for terms.

Get rid of bolding elements with tooltips.

Show/hide term summaries

Fix digits shown for transferred course attempts; add tooltip.
Merge branch 'smallFixes' into dev
Implement email delivery of permission numbers

Configured to use bwbecker's personal account.  That needs to change!
Email out to Jim Johnston.
Merge branch 'email' into dev
Render the index from the application menu so we only show what the user has access to.