ColorProfile moved into ViewOptions
synchronization with master branch
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
Merge branch 'master' into ice-cream-sandwich
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
synchronization with main branch
Merge branch 'beta' into beta-ics
Yota option moved from MiscOptions to ViewOptions
Merge branch 'ice-cream-sandwich' into beta-ics
TextStyleCollection moved into ViewOptions
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
Merge branch 'master' into ice-cream-sandwich
ZLTextStyleCollection.Screen field
Merge branch 'master' into beta
Merge branch 'master' into ice-cream-sandwich
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics