Merge branch 'develop' of https://github.com/MathieuCalba/mix-it-android into release/3.1
Merge branch 'release/3.1' into develop