added code to get cities
Merge branch 'master' of https://github.com/fe-ateam/hackathon

Conflicts:
	public/js/app.js