assignments controller
assignment views
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios

Conflicts:
	app/views/admin/normal_rooms/_normal_room.html.haml
	config/locales/views/rooms/en.yml