Merge origin/develop into develop

Conflicts:
	src/ca/qc/bdeb/inf203/model/Terrain.java
	src/ca/qc/bdeb/inf203/model/typescombatants/Normaux.java
Merge origin/develop into develop

Conflicts:
	src/ca/qc/bdeb/inf203/model/Joueur.java
	src/ca/qc/bdeb/inf203/model/Vague.java