formatting
Merge branch 'master' into cover_transfer_and_saving

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