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

Conflicts:
	application/mapbender