Including Map Engine

Ajout et corrections du fichier map.cpp
Merge remote-tracking branch 'origin/Map'