merge map new

cleanup
Merge branch 'master' of https://github.com/fin-ger/cg-st-adv