Merge branch 'develop' into asf-cities
City model added to router.js
Form-control for select city added.
Merge branch 'asf-cities' into develop