Finished html/css mock-up for Messages view
Merge branch 'messaging-with-group-conversations' of github.com:jcroteau/sample_app_rails4 into messaging-with-group-conversations

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/conversations/show.html.erb