Added new settings logic
Merge branch 'master' of https://github.com/pryv/mobile-notes into bugfixing