XAS-30 improve error messages when waiting for da.server to make a data
connection
Fix compiler error from plugin.xml
BLXX-65 switch to new plotting system for XAFS online analysis views
partial revert of PlotBean
TESTING: remove unused from classpath
Merge branch 'master' of
ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git

Conflicts:
	uk.ac.gda.client/src/uk/ac/gda/client/CommandQueueComposite.java
	uk.ac.gda.client/src/uk/ac/gda/client/NumberedQueueEntry.java