Tweaked layout with larger primary navigation and larger article content
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/views/home.jsp
	src/main/webapp/resources/css/custom-theme.css
	src/main/webapp/resources/css/custom.css
	src/main/webapp/resources/html/colors.html
	src/main/webapp/resources/html/controls.html
	src/main/webapp/resources/html/forms.html
	src/main/webapp/resources/html/gallery.html
	src/main/webapp/resources/html/home.html
	src/main/webapp/resources/html/navigation.html
	src/main/webapp/resources/html/tables.html
	src/main/webapp/resources/html/typography.html
	src/main/webapp/resources/img/abc-logo-gry-gry-trans.png
	src/main/webapp/resources/img/ui-icon.png
	src/main/webapp/resources/js/custom.js