code simplification
Merge branch 'master' into positions
Merge branch 'positions' of github.com:geometer/FBReaderJ into positions
Merge branch 'positions' of github.com:geometer/FBReaderJ into positions
code cleanup
Merge branch 'positions' of github.com:geometer/FBReaderJ into positions