settings
Merge branch 'master' of github.com:GMartigny/android_bicloo