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

Conflicts:
	AndroidManifest.xml
compilation issue
Merge branch 'master' into ice-cream-sandwich
fixed exception on unregisterReceiver() call
Merge branch 'master' into ice-cream-sandwich
fixed possible NPE
fixed AndroidManifest.xml: android:changes attribute
fixed AndroidManifest.xml: android:changes attribute

Conflicts:

	AndroidManifest.xml
	AndroidManifest.xml.pattern
Merge branch 'master' into ice-cream-sandwich
no android:changes attributes for hidden activities
Merge branch 'master' into ice-cream-sandwich
VERSION => 1.7.2
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
updated ChangeLog
Merge branch 'master' into ice-cream-sandwich