refactoring
Merge branch 'master' into dict_api

Conflicts:
	src/org/geometerplus/android/fbreader/DictionaryUtil.java