- @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
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'beta-ics' into betayota
Merge branch 'yota2' into betayota
ZLFileImage constructor signature changed
Merge branch 'beta' into beta-ics
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'beta-ics' into betayota
Merge branch 'yota2' into betayota
ZLLoadableImage => ZLImageProxy
Merge branch 'master' into ice-cream-sandwich
ZLLoadableImage => ZLImageProxy