added name to units
expanded serializers
added resource call for custom fields by unit to userControllers
resolved merge confilct and slightly refactored userControllers