new options collection: MiscOptions
cleanup: code re-ordering
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into yota
Merge branch 'ice-cream-sandwich' into yota2
synchronization with beta branch
code cleanup
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into yota
synchronization with beta branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into yota
code cleanup
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into yota
introduced ShadowConfig (not implemented yet)