FooterOptions moved into ViewOptions; PreferenceActivity does not refer FBReaderApp
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
Merge branch 'master' into ice-cream-sandwich
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
code simplification
Merge branch 'beta' into beta-ics
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
separate process for preferences activity
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics