Début reset
Merge branch 'master' of https://github.com/kakashi45/ProjetAndroidTeamLanister.git
Fin reset