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

Conflicts:
	app/views/admin/rooms/_form.html.haml
admin people controller and basic views
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios

Conflicts:
	app/views/admin/rooms/_form.html.haml