sync optimisation & cleanup
Merge branch 'master' into nook
'about fbreader' processing optimisation
Merge branch 'master' into nook
2.1.11
Merge branch 'master' into nook

Conflicts:
	AndroidManifest.xml