Merge branch 'feature/map_integration' of github.com:H4411/GHOME into feature/map_integration