fixed possible NPE
fixed possible NPE
updated ChangeLog
Merge branch 'master' into nook
version => 1.10.0.4
Merge branch 'master' into nook

Conflicts:
	AndroidManifest.xml
NPE in ZLTextPlainModel
NPE in zip
fixed possible OOB exception
Merge branch 'master' into nook