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

Conflicts:
	app/views/admin/rooms/index.html.haml
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios
Ajax call to create a user assignment to a room and also to destroy the assignment
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios