synchronization with beta branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/android/fbreader/BookmarksActivity.java
Merge branch 'ice-cream-sandwich' into library-service-ics

Conflicts:
	src/org/geometerplus/android/fbreader/BookmarksActivity.java
Merge branch 'library-service' into library-service-ics

Conflicts:
	src/org/geometerplus/android/fbreader/BookmarksActivity.java
fixed NPE
fixed NPE
removed debug printing
missing file
event processing in BookCollectionShadow
new item
Merge branch 'library-service' into library-service-ics