cbz += cbr
Merge branch 'master' of github.com:geometer/FBReaderJ
TYPES_CBZ => TYPES_COMIC_BOOK
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle