Merge branch 'master' into develop
Merge branch 'mgd-login' into develop
A proposal for city model
Route /cities added.
A first jade template for cities
Title and description as parameters added.
Revert "Title and description as parameters added."

This reverts commit 971e3c3e427b04e3e78ac798a1477afe2e9b4f8f.
Revert 971e3c3..4b0dd2e

This rolls back to commit 971e3c3e427b04e3e78ac798a1477afe2e9b4f8f.
Merge branch 'mgd-login' into develop
City model updated
Merge branch 'asf-cities' into develop

Conflicts:
	app.js
	config/database.js
merge alvaro's changes
Merge branch 'mgd-login' into develop

Conflicts:
	app.js
	config/database.js
Merge branch 'develop' into mgd-login