updates
updates
Merge branch 'master' of github.com:vincentpaca/new_offerchat

Conflicts:
	app/views/layouts/application.html.haml