no static ScrollingPreferences instance
Merge branch 'master' into ice-cream-sandwich
ScrollingPreferences => PageTurningOptions
Merge branch 'master' into ice-cream-sandwich
separate classes for options
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/fbreader/fbreader/options/PageTurningOptions.java
code cleanup
Merge branch 'master' into ice-cream-sandwich
AmbilWarna library + new color picker + style editing

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into ice-cream-sandwich
beta => 10; updated ChangeLog
Merge branch 'master' into ice-cream-sandwich
updated resources
Merge branch 'master' into ice-cream-sandwich
updated ChangeLog
Merge branch 'master' into ice-cream-sandwich
2-column view on 7 inch devices is enabled by default
Merge branch 'master' into ice-cream-sandwich