I13J As used on beamline
I13 GDA-5836 Intergrate PIE725 raster stage and configure to work with MaxiPix2MultiFrameDetector
I13-1: Update .springBeans file
i13-1: live_localhost launcher opens in background
I13-1: Various uncomitted changes found just before release 8.38 made [needs checking]
I13 Use new EXTERNAL ONLY triggering for PCO

As the folder is created by EPICS when creating the file we need to
suppress pathErrors.


Make new sw triggered detector for getting normalised image as we cannot
wait for rsync to make files available for analysis.
I13 - Remove use of Copy PVs in PCO
I13 - Create flyScanDetectorNoChunking for high speed tomography
I13 - Remove icat and define visit
I13 - Add help on script interface to flyscanning
I13 - After mt10007
Merge remote-tracking branch 'origin/8.36' into 8.36
I13J - Add Merlin detector
Merge branch '8.36' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-dls-beamlines-i13x.git into 8.36

Conflicts:
	i13i/devices/epics/pco1.xml
I13I - From beamline before merge to 8.38
Merge remote-tracking branch 'origin/8.36'

Conflicts:
	i13i/.springBeans
	i13i/properties/live/java.properties
	i13j/clients/main/common.xml
	uk.ac.gda.beamline.i13j/plugin.xml
I13J - Fix ADControllers following simplification of ADViewer configuration