Merge branch 'master' into beta
Merge branch 'beta' of github.com:geometer/FBReaderJ into beta