grammar
Merge branch 'beta' into beta-ics
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
config speed optimization
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
VERSION => 1.9.6
Merge branch 'master' into ice-cream-sandwich

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

Conflicts:
	AndroidManifest.xml
	ChangeLog
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics

Conflicts:
	AndroidManifest.xml
better processing for file errors
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	assets/resources/application/ca.xml
	assets/resources/application/da.xml
	src/org/geometerplus/android/fbreader/FBReader.java
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
re-ordering
Merge branch 'master' into ice-cream-sandwich