Merge branch 'dev' of github.com:cismet/cismap-scale-generator into dev
fixing #1 switch to log4j version 1.2.16