Fixing ObjectID city reference in user, now updates!
Merge branch 'mgd-login' into develop

Conflicts:
	app/server/model/city.js
	app/server/router.js
Integrating express-validator in profile.jade view
Merge branch 'mgd-login' into develop
Merge branch 'asf-cities' into develop

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