final additions for contexts/populators configuration files.
Merge branch 'master' of https://github.com/trichner/Metropolis

# By Thomas Richner
# Via Thomas Richner
* 'master' of https://github.com/trichner/Metropolis:
  tweaked partitioning, moved logging

Conflicts:
	src/ch/k42/metropolis/model/parcel/DistrictParcel.java
fixed merge issue.