Fix error, to pull master
Fix merge
refresh code
merged
merged with master
Refactoring day cycle
Merge pull request #22 from matthieuHanne/android

Android