Merge branch 'yota2' of github.com:geometer/FBReaderJ into yota2
Merge branch 'yota2' of github.com:geometer/FBReaderJ into yota2
partial refresh with md5
Merge branch 'yota2' of github.com:geometer/FBReaderJ into yota2
unnecessary changes rolled back
md5 fix
rgb565
code cleanup
Merge branch 'yota2' of github.com:geometer/FBReaderJ into yota2

Conflicts:
	src/com/yotadevices/fbreader/FBReaderYotaService.java
encryption.xml support
Merge branch 'master' into ice-cream-sandwich
Merge branch 'beta' into beta-ics
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'beta-ics' into yotabeta
imports cleanup
Merge branch 'yota2' into yotabeta

Conflicts:
	AndroidManifest.xml
	src/com/yotadevices/fbreader/FBReaderYotaService.java
packaging issue
Merge branch 'yota2' into yotabeta