Finishing UI. Missing the building tab.
Merge remote-tracking branch 'origin/dev' into devUI

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/TownCenter.java
merging
Merge pull request #76 from malmuki/devUI

Finishing UI. Missing the building tab.
Removed the old units
change the path constant for the watchtower
commit massage
Merge remote-tracking branch 'origin/dev' into Francois

Conflicts:
	TP3/src/ca/csf/RTS/game/entity/controllableEntity/building/WatchTower.java
Merge pull request #79 from malmuki/Francois

Francois
geneleralized find closest location
Merge pull request #80 from malmuki/Francois

geneleralized find closest location
UI Buttons
Merge branch 'dev' of https://github.com/malmuki/Tp3-RTS-A14 into dev

Conflicts:
	TP3/src/ca/csf/RTS/game/Game.java
on peux clicker dans le UI!!!!
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