fixed NPE in Bookmark comparator
fixed NPE (?)
VERSION => 1.7.1
Merge branch 'master' into ice-cream-sandwich

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

Conflicts:
	AndroidManifest.xml
	src/org/geometerplus/android/fbreader/library/LibraryActivity.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics

Conflicts:
	AndroidManifest.xml
compilation issue
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
fixed exception on unregisterReceiver() call
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
fixed possible NPE
fixed AndroidManifest.xml: android:changes attribute
fixed AndroidManifest.xml: android:changes attribute

Conflicts:

	AndroidManifest.xml
	AndroidManifest.xml.pattern