Cambios Varios
Merge branch 'master' of https://github.com/sebafra/co_app

Conflicts:
	app/views/ConversationsView.js