possible fix for NPE in 1.9.5
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/book/BookCollection.java
compilation issue
Merge branch 'master' into beta
1.9.5.1
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml
	ChangeLog
BookUrlInfo.Format is now class, not String
Comparable<Format>
Name => Extension
code optimization
order as in master branch
better equals & hashCode
imports cleanup
code simplification
missing negation
synchronization with beta branch
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/network/BookDownloaderService.java
	src/org/geometerplus/fbreader/network/opds/OPDSBookItem.java
	src/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java
	src/org/geometerplus/fbreader/network/urlInfo/BookUrlInfo.java
formatting
Merge branch 'master' into beta
unused method