Loading MapManager from tmp file for faster rendering
Javadoc for MapManager and Map classes OK
Add new classes for Proximity, Territory and Height maps
Add tmp folder to the gitignore
Merge branch 'thomas'

Conflicts:
	img/map/npm0.png
	img/map/npm1.png
	img/map/npm2.png
	img/map/npm3.png
	img/map/npm4.png
	img/map/npm5.png
	img/map/tm.png
Merge branch 'aurelie'
Fixing some bugs (territory map location)