fixed font file name + removing temp font file
Merge branch 'beta' into beta-ics
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'master' into beta
no debug printing
Merge branch 'master' into ice-cream-sandwich
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'master' into beta
no "encryption method" for entire epub, just encryption info map for separate files
Merge branch 'master' into ice-cream-sandwich
Merge branch 'beta' into beta-ics
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
EncryptionMethod.NONE constant has gone
Merge branch 'master' into beta
Merge branch 'master' into ice-cream-sandwich
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics