code cleanup
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/android/fbreader/library/LibraryActivity.java