- @TargetApi
obsolete xhtml code has gone; ZLFileImage has no mimetype field; PluginImage extends ZLLoadableImage directly
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/formats/external/PluginImage.java
ZLFileImage constructor signature changed
Merge branch 'master' into beta
ZLLoadableImage => ZLImageProxy
ZLLoadableImage => ZLImageProxy
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/formats/external/PluginImage.java
	src/org/geometerplus/zlibrary/ui/android/image/AndroidImageSynchronizer.java
class MetaInfoUtil has gone