fixed possible NPE
Merge branch 'master' into beta
- => _
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
fixed possible NPE
actual branches
Merge branch 'master' into beta
actual branches
Merge branch 'master' into beta