Minor bug fixes
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios
half the Fourth iteration
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios

Conflicts:
	app/models/.message_template.rb.swp
	app/views/admin/assignments/index.html.haml
	app/views/admin/normal_rooms/._normal_room.html.haml.swp
	app/views/messages/_new.html.haml
	config/routes.rb
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios