update
Merge branch 'master' of https://github.com/nmdapps/makina-android-sdk