synchronization with beta branch
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/android/fbreader/BookmarksActivity.java
fixed NPE
removed debug printing
missing file
event processing in BookCollectionShadow
new item