refactor settings
Merge branch 'master' of https://github.com/pryv/mobile-position-android