Merge branch '8.30' of ssh://dasc-git.diamond.ac.uk/gda/gda-core into 8.30
ProcessingDetectorWrapper no longer calls readout on detector just to
print the last svaed file location in atScanEnd.
Update SwitchableHardwareTriggerableProcessingDetectorWrapper to account
for changes to HardwareTriggerableDetector API made in 8 .30
Refactored TwodGauusianPeakWithCalibration to remove copied class and
also tidied up output columns and added clibrated fwhm and fwhmarea
columns
I uk.ac.gda.core PyDev nature, put uk.ac.gda.core/bin back on the path
BLVII-34 - Add button to display Y axis as Log10
Merge branch '8.30' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git into 8.30
Merge remote branch 'remotes/origin/8.30' into 8.30
Merge remote branch 'remotes/origin/8.30' into 8.30
do not add empty Label when no label requested
Merge branch '8.30' of ssh://dasc-git.diamond.ac.uk/gda/gda-core into 8.30
fix cut&paste logic bugs
Merge branch '8.30' of ssh://dasc-git.diamond.ac.uk/gda/gda-core into 8.30
Merge remote branch 'origin/8.30'

Conflicts:
	uk.ac.gda.client/src/uk/ac/gda/client/liveplot/LivePlotComposite.java