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

Conflicts:
	app/models/room_related/normal_room.rb
	config/application.rb
	db/schema.rb
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios