modif modele metier
ttt
Merge branch 'master' of https://github.com/M1INFO-GB/PacMan

Conflicts:
	PrototypesTechniques/DeplacerPacMan/deplacerPacMan/deplacerPacMan.pro.user
	PrototypesTechniques/DeplacerPacMan/deplacerPacMan/deplacerPacMan.pro.user.821604c
Revert "modif modele metier"

This reverts commit 9b2f2ae058d9e960fb9dcb548104b3b229ea5842.