user-office assignation
Merge branch 'master' of https://github.com/jcabotc/centro_negocios

Conflicts:
	app/controllers/base_controller.rb
	app/controllers/home_controller.rb