Refactoring
Merge branch 'tags-master' of github.com:geometer/FBReaderJ into tags-master