pseudofix for NPE in page info building
unix style line ends
formatting

Conflicts:

	src/org/amse/ys/zip/NoCompressionDecompressor.java
	src/org/amse/ys/zip/ZipInputStream.java
mobi: blockquote tag support
UnsatisfiedLinkError exception processing
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