- More bug fixes.
- UI fixes.
Merge origin/master

Conflicts:
	views/scripts/dean/advise.php
- More bug fixes.
- UI improvements.