Added city_id to users. Updated controllers to use before actions to set necessary objects