fixed version of scijava
Merge branch 'master' of github.com:knime-ip/knip

Conflicts:
	org.knime.knip.scijava/.classpath