remove compiler warning and chnage to correct xspress editor id
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-scm.git