compilation issue
Merge branch 'master' into tags-master
compilation issue
Merge branch 'master' into tags-master

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