Merge branch 'manual-objectives' into dev

Conflicts:
	css/ccap-anatomy.less