references changes between messages & user
Merge branch 'master' of https://github.com/max-konin/Kogdata

Conflicts:
	app/controllers/conversations_controller.rb
	config/routes.rb
Merge branch 'master' of https://github.com/max-konin/Kogdata

Conflicts:
	app/controllers/conversations_controller.rb
	config/routes.rb
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/routes.rb
Merge branch 'master' of https://github.com/max-konin/Kogdata

Conflicts:
	app/controllers/conversations_controller.rb
	config/routes.rb
Merge remote-tracking branch 'origin/master'