dasdas
asd
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/contact_us/controllers.js
	app/views/contact_us/contact/messages.html.haml
	app/views/contact_us/contact/show_message.html.haml
asd