structural changes in map_mgt
Merge branch 'master' of https://github.com/GieSeel/SWE13_Project.git