Update of some files for the Android App
Removal of the Android Project
Removal of the Android Project
Setup of the Android Project
Resolution of conflicts
Naming of the first version : Kakapo
Merge remote-tracking branch 'origin/master' into develop
Final resolution of conflicts