Added upgrade classes and units model
Merge remote-tracking branch 'origin/dev' into devUpgrades

Conflicts:
	TP3/src/ca/csf/RTS/game/Game.java
	TP3/src/ca/csf/RTS/game/Team.java
	TP3/src/ca/csf/RTS/game/entity/controllableEntity/building/WatchTower.java
	TP3/src/ca/csf/RTS/game/entity/controllableEntity/building/factory/Trainable.java
Merge pull request #81 from malmuki/devUpgrades

Dev upgrades
allo
Merge branch 'dev' of https://github.com/malmuki/Tp3-RTS-A14.git into
dev

Conflicts:
	TP3/src/ca/csf/RTS/game/Game.java
	TP3/src/ca/csf/RTS/game/GameController.java
merge resolve
RANDOM
Merge branch 'dev' of https://github.com/malmuki/Tp3-RTS-A14 into dev

Conflicts:
	TP3/src/ca/csf/RTS/game/Game.java
	TP3/src/ca/csf/RTS/game/GameController.java
-stats of footman and tower are now based on model
-forge code is now done
Merge pull request #83 from malmuki/devUpgrades

-stats of footman and tower are now based on model
-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
hot fix
fix the menu bug
Merge pull request #85 from malmuki/Francois

Francois
Fixed TownCenter and Barracks buttons
update training
Merge pull request #86 from malmuki/Francois

update training
can now build building!!!(now we need to make it look like it does)