Cleaning up users controller
Cleaning up users controller

Conflicts:
	bin/loaders/generic_facilities_loader.rb
	db/schema.rb

camsys/transam_core,nycdot/transam_core,camsys/transam_core,camsys/transam_core,nycdot/transam_core,nycdot/transam_core,camsys/transam_core