Merge pull request #47 from malmuki/dev

Merge pull request #46 from malmuki/devMeleeAttacks
added "blocked" StateInteraction
removed useless import
Merge pull request #49 from malmuki/devMeleeAttacks

Merge pull request #47 from malmuki/dev
Merge remote-tracking branch 'origin/dev' into Francois

Conflicts:
	TP3/src/ca/csf/RTS/game/entity/state/Move.java
	TP3/src/ca/csf/RTS/game/entity/state/StateInteraction.java