yota option moved to FBReaderApp + missing imports
refactoring: no ZLTextStyleCollection.Instance() method
Merge branch 'master' into ice-cream-sandwich

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