popup2
Merge branch 'feature/popup2' of github.com:mapbender/mapbender into feature/popup2