Merge branch 'master' into imgsaver

Conflicts:
	org.knime.knip.scifio/.classpath
Merge branch 'imgSaver' of https://github.com/knime-ip/knip into imgsaver