compilation issue
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/formats/ExternalFormatPlugin.java
compilation issue
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/formats/ExternalFormatPlugin.java