front clean up
Merge branch 'master' of github.com:TheCodery/btmancini
merging contact-us content.html
Conflicts:
	db/cms_fixtures/btmancini-co/layouts/contact-us/content.html
Merge branch 'master' of github.com:TheCodery/btmancini
merge

Conflicts:
	app/views/partials/_contact_form.html.haml