synchronization with cover_sync branch
Merge branch 'master' into covers_sync

Conflicts:
	src/org/geometerplus/fbreader/book/BookEvent.java
synchronization with covers_sync branch
Merge branch 'master' into covers_sync

Conflicts:
	src/org/geometerplus/android/fbreader/libraryService/LibraryService.java