no static ScrollingPreferences instance
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
ScrollingPreferences => PageTurningOptions
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
separate classes for options
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
	src/org/geometerplus/fbreader/fbreader/FBView.java
	src/org/geometerplus/fbreader/fbreader/options/PageTurningOptions.java
code cleanup
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
AmbilWarna library + new color picker + style editing

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

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