room views (person login not working, can :manage, :all to avoid problems while solving it)
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios

Conflicts:
	app/controllers/admin/rooms_controller.rb
	app/views/admin/rooms/_form.html.haml
	app/views/admin/rooms/index.html.haml
	app/views/admin/rooms/new.html.haml