Minor refactoring of bookmark model
Merge branch 'master' of https://github.com/BigRomanov/Bookeez