Merge branch 'develop' into mgd-login
Merge branch 'asf-cities' into develop
Merge branch 'develop' into mgd-login
anadimos ruta /ciudad/:city - comienzo a trabajar en la vista por ciudades
update profile with list of cities and save to DB
Merge branch 'mgd-login' into develop
Merge branch 'asf-cities' into develop

Conflicts:
	app/server/model/city.js
Merge branch 'develop' into asf-cities

Conflicts:
	app/server/model/city.js