Refactoring view messaages css
tests for conversation controller
tests for conversation controller
Merge branch 'master' of https://github.com/max-konin/Kogdata

Conflicts:
	test/fixtures/conversations.yml
	test/fixtures/conversations_users.yml
	test/unit/conversation_test.rb
	test/unit/helpers/messages_helper_test.rb
Merge remote-tracking branch 'origin/master'