add gameMap pointer to mapItem
Merge branch 'master' of https://github.com/jcambray/ProjetWarCPP

Conflicts:
	warCPP/game.cpp