Various UI changes

Includes: logo, Contact US page, various text changes, and changing
section colors
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/i18n/application.properties