formatting
Merge branch 'master' of github.com:bigfishcat/FBReaderJ into bigfishcat-master

Conflicts:
	src/org/geometerplus/android/fbreader/DictionaryUtil.java
Merge branch 'dict_api' into bigfishcat-master

Conflicts:
	src/org/geometerplus/android/fbreader/DictionaryUtil.java
formatting
formatting
Merge branch 'master' into dict_api
formatting
code simplification
formatting