refacto des modeles et controleurs
Merge pull request #50 from alaurenty/refacto

refacto des modeles et controleurs
fixes after conflict