anadimos ruta /ciudad/:city - comienzo a trabajar en la vista por ciudades
City model updated.
Updated
It was just a test file
Text reviewed
Merge branch 'mgd-login' into develop
Some lines updated
Merge branch 'asf-cities' into develop

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

Conflicts:
	app/server/model/city.js
City model updated
converterSlug function added
Merge branch 'mgd-login' into develop

Conflicts:
	app/server/model/city.js
	app/server/router.js
City model updated.
Country model added
Schemas updated
Inserting cities_es on database
Merge branch 'mgd-login' into develop
Inserting cities_es on database
Showing cities order by name
City and Country models updated