Merge branch 'asf-cities' into develop
City model updated
City model updated
Merge branch 'develop' into asf-cities

Conflicts:
	app/server/model/city.js