conversations and messages basic setup
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios

Conflicts:
	app/controllers/conversations_controller.rb
	app/controllers/messages_controller.rb
	app/models/message_template.rb
	app/views/conversations/index.html.haml
	app/views/messages/new.html.haml