more changes
Merge branch 'feature/testing' of github.com:mapbender/mapbender into feature/testing