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

Conflicts:
	app/views/admin/meeting_rooms/index.html.haml