bug fixes, student experience, change, institutional nag
Merge branch 'fac-layout' of https://github.com/ualberta/institutional-framework into fac-layout

Conflicts:
	custom/athletics/custom.css