backup
Merge branch '3.0' of github.com:mapbender/mapbender into 3.0
wmc, wms changed