Added the mapping-plugin incl. menu contribution
Merge remote-tracking branch 'origin/master'