0.0.1 stopped on data models creation
Merge remote-tracking branch 'origin/master'

Conflicts:
	models/city.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	models/city.js

saving new version