synchronization with beta branch
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/formats/external/PluginImage.java
repackaging
Merge branch 'master' into beta