captions, fluid, link category module
Merge branch 'fac-layout' of https://github.com/ualberta/institutional-framework into fac-layout

Conflicts:
	css/faculty.css
	css/framework-base.css
	css/framework.css
	less/framework/base/buttons.less