done with ui
Merge branch 'master' into messageUi

Conflicts:
	app/views/studygroups/show.html.erb
Merge branch 'messageui'
Merge branch 'master' of https://github.com/dkumar/MeetMyClassmates