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.