Reintegrated map branch

It's tested and the map view works. That's all folks. Don't expect anything since it's just a proof of concept.
Merging with master to prevent conflits later on.