Merge branch 'master' of https://github.com/ualberta/institutional-framework

Conflicts:
	css/framework.css
Merge branch 'master' of https://github.com/ualberta/institutional-framework

Conflicts:
	css/framework.css
	html/departments-master.html