try all video types (code is not tested yet)
Merge branch 'master' into ice-cream-sandwich
ePub3 font obfuscating support (in progress)
code re-use
Merge branch 'master' into ice-cream-sandwich
code re-use
full font obfuscation support
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	jni/NativeFormats/fbreader/src/formats/oeb/OEBUidReader.cpp
removed extra space in id
Merge branch 'master' into ice-cream-sandwich
new info fields in preferences dialog
Merge branch 'master' into ice-cream-sandwich
updated ChangeLog
Merge branch 'master' into ice-cream-sandwich
fixed NPE
Merge branch 'master' into ice-cream-sandwich
updated version num
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
version => 1.10.0.2
one more NPE

Conflicts:
	AndroidManifest.xml