ColorProfile moved into ViewOptions
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBView.java
Yota option moved from MiscOptions to ViewOptions
Merge branch 'ice-cream-sandwich' into yota2
TextStyleCollection moved into ViewOptions
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
ZLTextStyleCollection.Screen field
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
compilation issues