1.9.5.5
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
refactoring: special options (with values saved in local storage too)
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
	src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'beta' into beta-ics
special storage for color profile name
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
	src/org/geometerplus/fbreader/fbreader/options/ViewOptions.java
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'beta' into beta-ics