pull commit
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios

Conflicts:
	app/views/messages/_new.html.haml
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios
coworking rooms not finished yet