Implemented basic map renderer.
Merge 2D mapping
Merge branch 'KevinVDVelden-upstream'