Merge branch 'master' of github.com:geometer/FBReaderJ
Merge branch 'master' into android-1.5