Correct ncdsim object server launcher
Merge branch 'master' into hplc
Fix default file samples having blank mode
Fix ncdsim launchers for dawn plugin changes
Turn down jacorb verbosity for sim
Merge branch 'master' into hplc

Conflicts:
	configurations/ncdsim-config/ncdsim RCP GUI (i22).launch
Removed method which was not actively doing something.
Merge branch 'hplc' of ssh://dasc-git.diamond.ac.uk/gda/gda-scm into hplc
Merge branch 'master' into hplc
Use correct string for status
Set modes in xml. Combine hplc and bssc xml files
Check modes for Biosaxs setup
Move common wizard code to hatsaxs plugin
Improve layout for hatsaxs setup perspectives (processing checkbox)
Add serialisation IDs and remove unnecessary annotations
Update all MANIFESTs, .classpaths, features and plugins

Probably needed for previous commits to run