Integration of ArmyManager, part 1
Merge branch 'master' of github.com:clejeu03/TowerDefense
Integration of ArmyManager, part 2 + Increasing base amount with time
Merge branch 'aurelie'

Conflicts:
	src/GameEngine/ArmyManager.java
	src/GameEngine/GameManager.java
	src/GameEngine/Unit.java
View - Test displaying image player