no static ScrollingPreferences instance
Merge branch 'master' into android-1.5
ScrollingPreferences => PageTurningOptions
Merge branch 'master' into android-1.5
separate classes for options
Merge branch 'master' into android-1.5
code cleanup
Merge branch 'master' into android-1.5
AmbilWarna library + new color picker + style editing

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into android-1.5

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
	project.properties
beta => 10; updated ChangeLog
Merge branch 'master' into android-1.5
updated resources
Merge branch 'master' into android-1.5
compatibility with android-1.5
updated ChangeLog
Merge branch 'master' into android-1.5
2-column view on 7 inch devices is enabled by default
Merge branch 'master' into android-1.5