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 'ice-cream-sandwich' into yota2
imports cleanup
packaging issue