fixed synchronization in ZLApplication/FBReaderApp
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/zlibrary/core/application/ZLApplication.java
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into ice-cream-sandwich
OPDS loading optimization
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich
font smoothing settings
hinting option works on devices with SDK >= 14 only
fixed 'quistion symbols in menu' issue
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
	ChangeLog
	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
	src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java
Action bar is now shown by default
Merge branch 'master' into ice-cream-sandwich
Calibre's fb2 mimetype has been supported
full strike through support for FB2
Merge branch 'master' into ice-cream-sandwich
asynchronous scanning for Calibre servers
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/network/ScanLocalNetworkActivity.java
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich