code simplification
Merge branch 'master' into beta

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