library rescan operation + resources
Merge branch 'master' into android-1.5

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java