presque fini!!!!
fini les test des states!!!!!!!
minipatch
made upgrades researchable
Merge remote-tracking branch 'origin/dev' into Gab

Conflicts:
	TP3/src/ca/csf/RTS/game/GameController.java