XAS-172 minor change to get code compiling
XAS-172_refactor: Added bm26a preparer classes.
XAS-172 update BM26a config after changes to XAS objects and perparer interfaces
XAS-172_refactor: bm26a configuration change
Merge branch 'XAS-172_refactor' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-scm.git into XAS-172_refactor

Conflicts:
	configurations/bm26a-config/scripts/localStation.py
	plugins/fr.esrf.gda.beamline.bm26a/src/gda/exafs/scan/preparers/BM26aDetectorPreparer.java
	plugins/fr.esrf.gda.beamline.bm26a/src/gda/exafs/scan/preparers/BM26aOutputPreparer.java
	plugins/fr.esrf.gda.beamline.bm26a/src/gda/exafs/scan/preparers/BM26aSamplePreparer.java
XAS-172_refactor: bm26a preparers
XAS-172_refactor: remove redundant ExafsScritpController from AsciiDataWriter
XAS-172 changes to bm26a configuration to work with new Java experimental logic

includes changes in localStation.py to import the new command
XAS-172 fix preparer to prevent NPE
XAS-1972 change to interface after integration of I18 map scans
Merge remote-tracking branch 'origin/master' into XAS-172_refactor

Conflicts:
	configurations/bm26a-config/buckminster.cspec
	features/fr.esrf.gda.beamline.bm26a.feature/fr.esrf.gda.beamline.bm26a.product.launch
GDA-6000 replace DataSet with Dataset
Merge remote-tracking branch 'origin/XAS-172_refactor'
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-scm.git