changes related to images
Merge branch 'master' of https://github.com/Notalib/nota.oxygen

Conflicts:
	addins/frameworks/xhtmlepub/xhtmlepub.framework
	addins/src/nota/oxygen/epub/figures/InsertFigureOperation.java
	addins/src/nota/oxygen/epub/figures/InsertFiguresOperation.java
changes related to images
images more
Merge pull request #34 from ybk/master

images more