formatting

Conflicts:

	src/org/geometerplus/fbreader/formats/html/HtmlReader.java
formatting
formatting

Conflicts:

	src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java
formatting

Conflicts:

	src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java
formatting

Conflicts:

	src/org/geometerplus/android/fbreader/DictionaryUtil.java
fixed behaviour
unused import
ApiObject.Float type
formatting
formatting
formatting

Conflicts:

	src/org/geometerplus/android/fbreader/FBReader.java
formatting

Conflicts:

	src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java
formatting

Conflicts:

	src/org/geometerplus/zlibrary/core/image/ZLFileImage.java
formatting
formatting

Conflicts:

	src/org/geometerplus/zlibrary/text/view/ZLTextView.java
formatting
formatting

Conflicts:

	src/org/geometerplus/zlibrary/core/util/ZLColor.java
formatting

Conflicts:

	src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java
	src/org/geometerplus/android/fbreader/preferences/ZLColorPreference.java
	src/org/geometerplus/fbreader/library/Library.java
	src/org/geometerplus/zlibrary/core/html/ZLHtmlParser.java
	src/org/geometerplus/zlibrary/core/xml/ZLXMLReaderAdapter.java
	src/org/geometerplus/zlibrary/text/view/ZLTextWordCursor.java
	src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java
formatting

Conflicts:

	src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
	src/org/geometerplus/android/fbreader/library/LibraryActivity.java
formatting