synchronisation with intro branch
Merge branch 'master' of github.com:geometer/FBReaderJ