sync optimisation & cleanup
Merge branch 'master' into ice-cream-sandwich
'about fbreader' processing optimisation
Merge branch 'master' into ice-cream-sandwich
2.1.11
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml