preface comment
removed testing overrides
Merge branch 'regression' into dev

Conflicts:
	css/ccap-sociology.css
	css/ccap-sociology.less