Addition to the diffraction tool so nexus metadata is used
Merge branch 'master' of git@github.com:DawnScience/dawn-ui.git

Conflicts:
	org.dawnsci.plotting/src/org/dawnsci/plotting/tools/diffraction/DiffractionTool.java