possible fix for NPE in 1.9.5
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

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

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml
	ChangeLog
Merge branch 'beta' into beta-ics

Conflicts:
	AndroidManifest.xml
Merge branch 'ice-cream-sandwich' into beta-ics

Conflicts:
	AndroidManifest.xml
BookUrlInfo.Format is now class, not String
Merge branch 'beta' into beta-ics
Comparable<Format>
Merge branch 'beta' into beta-ics
Name => Extension