FooterOptions moved into ViewOptions; PreferenceActivity does not refer FBReaderApp
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
	src/org/geometerplus/fbreader/fbreader/FBView.java
Merge branch 'yota2' into kindle
code simplification
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
separate process for preferences activity
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle