Sounds and Music
Merge remote-tracking branch 'origin/dev' into Francois

Conflicts:
	TP3/src/ca/csf/RTS/game/GameController.java
Merge pull request #92 from malmuki/Francois

Francois