Generation of ProximityMap OK
Refactoring OK
Neutral base ON-GOING
Neutral bases OK
Relief for HeightMap OK
Merge branch 'thomas'

Conflicts:
	src/GameEngine/MapManager.java
Merge branch 'aurelie'
Merge bugs fixed
Bases initialisation