-so much stuff
Merge remote-tracking branch 'origin/dev' into Francois

Conflicts:
	TP3/src/ca/csf/RTS/game/Game.java
	TP3/src/ca/csf/RTS/game/GameController.java
	TP3/src/ca/csf/RTS/game/entity/controllableEntity/building/WatchTower.java
	TP3/src/ca/csf/RTS/game/entity/controllableEntity/building/factory/Barrack.java
	TP3/src/ca/csf/RTS/game/entity/controllableEntity/building/factory/Forge.java
	TP3/src/ca/csf/RTS/game/entity/controllableEntity/building/factory/Trainee.java
	TP3/src/ca/csf/RTS/game/entity/controllableEntity/human/FootMan.java
	TP3/src/ca/csf/RTS/upgrades/FootmanUpgrade.java
	TP3/src/ca/csf/RTS/upgrades/Upgrade.java
	TP3/src/ca/csf/RTS/upgrades/WathTowerUpgrade.java
	TP3/src/ca/csf/RTS/upgrades/WorkerUpgrade.java
Merge pull request #84 from malmuki/Francois

Francois