yota option moved to FBReaderApp + missing imports
Merge branch 'ice-cream-sandwich' into beta-ics

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
refactoring: no ZLTextStyleCollection.Instance() method
Merge branch 'master' into ice-cream-sandwich

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

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
merging
Merge branch 'beta' into beta-ics

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
Merge branch 'ice-cream-sandwich' into beta-ics

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java