merged pull requests mapbender/mapbender#349, mapbender/mapbender#355, mapbender/mapbender#356
merged pull requests mapbender/mapbender#349, mapbender/mapbender#355, mapbender/mapbender#356

mapbender/mapbender-starter,mapbender/mapbender-starter