View comments end !
Generation of ProximityMap OK
View -  BaseSprite clicked management (beginning)
Adding a parameters panel to create a new game (beginning)
Merge branch 'aurelie'
Refactoring OK
Neutral base ON-GOING
Neutral bases OK
Relief for HeightMap OK
Merge branch 'thomas'

Conflicts:
	src/GameEngine/MapManager.java
View - choose your starter, the number of player and your ennemies
Merge branch 'aurelie'
Merge bugs fixed
Bases initialisation
New map +  View : displaying the bases initialized by the engine (test)
Loading MapManager from tmp file for faster rendering
View - add an attack tower (everywhere...)
Class Base, Unit and ArmyManager optimized
Changed GunTower into AttackTower and MedicalTower into SupportTower
Modyfying the TowerManager to improve the tower creation
Settled the TowerManager functions