fixed possible NPE
fixed possible NPE
updated ChangeLog
Merge branch 'master' into ice-cream-sandwich
fixed yota-specific class cast exception
Merge branch 'master' into beta

Conflicts:
	ChangeLog
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
version => 1.10.0.4
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics

Conflicts:
	AndroidManifest.xml
NPE in ZLTextPlainModel
NPE in zip
fixed possible OOB exception
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