Begin Fruit basket
Merge branch 'master-julien' of https://github.com/julienCsj/ProjetAndroid into master-leo