library rescan operation + resources
Merge branch 'master' into library-service

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