Merge pull request #35 from mdjordjevic/bugfixing

Bugfixing
Merge pull request #36 from mdjordjevic/bugfixing

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