fixed NPE in Bookmark comparator
fixed NPE (?)
VERSION => 1.7.1
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml
	src/org/geometerplus/android/fbreader/library/LibraryActivity.java
compilation issue
Merge branch 'master' into beta
fixed exception on unregisterReceiver() call
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
fixed possible NPE
fixed AndroidManifest.xml: android:changes attribute

Conflicts:

	AndroidManifest.xml
	AndroidManifest.xml.pattern
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
no android:changes attributes for hidden activities
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
VERSION => 1.7.2
Merge branch 'master' into beta

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

Conflicts:
	ChangeLog
Merge branch 'beta' of github.com:geometer/FBReaderJ into beta