Add markup and styling for Typography diagrams
Merge branch 'gh-pages' into type-diagrams

Conflicts:
	assets/css/design-manual.css
	assets/css/design-manual.lt-ie9.min.css
	assets/css/design-manual.min.css
	assets/js/capital-framework.min.js
	assets/js/design-manual.min.js
	assets/js/html5shiv-printshiv.js
	assets/js/vendor.min.js
	front/src/less/design-manual/content.less
Merge pull request #49 from Scotchester/type-diagrams

Add markup and styling for Typography diagrams