path options
Merge branch 'master' into beta

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