bugfixes
Merge branch 'develop' of github.com:mapbender/mapbender into develop