Fixing the conversation show page
changes? i think?

Merge branch 'master' of https://github.com/byelipk/lollypop

Conflicts:
	app/views/conversations/new.html.erb
Merge branch 'master' of https://github.com/byelipk/lollypop