resolved conflicts for automerge

Conflicts:
	css/ccap-anatomy.css
	css/ccap-anatomy.less
	css/ccap-biology.css
	css/ccap-biology.less
	css/ccap-physics.css
	css/ccap-physics.less
	css/ccap-sociology.css
	css/ccap-sociology.less
Merge pull request #77 from Connexions/refactor-book-toc

Refactor CCAP book toc
Merge branch 'master' into refactoring

Resolved Conflicts:
	css/ccap-anatomy.less
	css/ccap-biology.css
	css/ccap-biology.less
	css/ccap-physics.css
	css/ccap-physics.less
	css/ccap-sociology.css
	css/ccap-sociology.less