Corrections for municipality app
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/javascripts/app.js
Corrections for municipality app