More portal/admin consolidation: unify info bars / breadcrumbs
Prevent type highlight being overridden
Cleanup of portal messaging functions
Move watch functionality to profile controller, and fill in some
unimplemented non-ajax views with a simple, rudimentary re-usable
form.
Merge branch 'master' into play-2.3

Conflicts:
	modules/portal/app/assets/js/portal-connected.js
	modules/portal/app/assets/js/portal.js