Merge pull request #1 from malmuki/dev

Dev
Merge pull request #2 from malmuki/dev

Dev
Merge pull request #3 from malmuki/dev

Dev
Merge pull request #4 from malmuki/dev

map boundaries
Merge pull request #21 from malmuki/dev

Dev
Merge pull request #27 from malmuki/devMovePath

Dev move path
Revert "Dev move path"
Merge pull request #28 from malmuki/revert-27-devMovePath

Revert "Dev move path"
Merge pull request #74 from malmuki/Francois

bug fixes
flush
Merge branch 'master' into dev
Merge branch 'master' into dev
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
Merge remote-tracking branch 'origin/dev' into Francois

Conflicts:
	TP3/src/ca/csf/RTS/game/entity/controllableEntity/building/WatchTower.java