mapbender + fom update
Merge branch 'develop' of github.com:mapbender/mapbender-starter into develop