grammar
Merge branch 'master' into beta
config speed optimization
Merge branch 'master' into beta
VERSION => 1.9.6
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml
	ChangeLog
better processing for file errors
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 beta
resources cleanup