Now show population data
Put settlements into one layer, add to control
Improve formatting
Merge remote-tracking branch 'fodaro/master'

Conflicts:
	resources/map.js