Fix #10
Merge branch 'design' of github.com:mapbender/mapbender-starter into design

Conflicts:
	application/mapbender