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
synchronization with main branch
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
ZLTextStyleCollection.Screen field
Merge branch 'master' into beta