synchronization with yota2 branch
1.9.4
Match background option
Merge branch 'master' into ice-cream-sandwich

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

Conflicts:
	AndroidManifest.xml
	ChangeLog
	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
	src/org/geometerplus/fbreader/fbreader/FBView.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics

Conflicts:
	AndroidManifest.xml