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

Conflicts:
	app/models/room_related/open_room.rb
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios