Modif encodage
Merge branch 'rallyman' of https://github.com/gdufrene/GamePortal into rallyman

Conflicts:
	src/fr/eservice/rallyman/controller/JeuController.java
	src/fr/eservice/rallyman/model/entite/Des.java