Correct CityController code
show the combo and check box selected in edit page
showing the selected checkbox/combox box in edit page

Conflicts:
	api/controllers/CityController.js