Conflict issue
Merge branch 'master' of https://github.com/karstenrowe/hb-dotcom

Conflicts:
	about/testimonials/index.php
	css/styles.css
	index.php
	js/jquery.js
	less/bootstrap.less
	less/styles.less
	news/index.php
	resource/font-awesome-4.0.3/fonts/fontawesome-webfont.eot
	resource/font-awesome-4.0.3/fonts/fontawesome-webfont.svg
	resource/font-awesome-4.0.3/fonts/fontawesome-webfont.ttf
	resource/font-awesome-4.0.3/fonts/fontawesome-webfont.woff
	sitemap.txt