Merge pull request #40 from malmuki/Francois

Francois
Merge pull request #42 from malmuki/Francois

aranger encore un merge -_-
Target is now entity
Target is now an entity rather than a game object
Merge branch 'dev' of https://github.com/malmuki/Tp3-RTS-A14.git into devMeleeAttacks
if a unit is blocked by it's target, it will now kill it
Merge pull request #46 from malmuki/devMeleeAttacks

Dev melee attacks
Merge remote-tracking branch 'origin/dev' into Francois

Conflicts:
	TP3/src/ca/csf/RTS/game/entity/state/Attack.java
	TP3/src/ca/csf/RTS/game/entity/state/Move.java
	TP3/src/ca/csf/RTS/game/pathFinding/PathFinder.java