fixed conversation and jake's display part
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/conversation.rb
	app/views/conversations/new.html.erb