Map functionality update
Merge branch 'development' of https://github.com/oSoc14/Leiedal2 into development