Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-core.git

Conflicts:
	uk.ac.diamond.scisoft.analysis.processing/plugin.xml