modified:   application/src/main/scala/com/paris7/mayorpro/model/Player.scala
Merge branch 'master' of https://github.com/ziellim/Mayor-Pro

Conflicts:
	application/.idea/workspace.xml
	application/src/main/scala/com/paris7/mayorpro/model/Player.scala
Merge branch 'master' of https://github.com/ziellim/Mayor-Pro
Mise à jour des Classes Model
Mise à jour des classes