Update from Giles Knap for generateRaster.py - fixes alignment bug.
BLXVI (8.38) Pv name for ADPilatus fixed.
BLXVI (8.38) - EDXDMappingController temporary set acquisition time fix.
Replace with master revision.
Merge branch '8.38' of ssh://dasc-git.diamond.ac.uk/gda/gda-epics into 8.38

Conflicts:
	uk.ac.gda.epics/scripts/epics_scripts/device/scannable/pie725/generateRaster.py
Merge branch 'i16_gda-8.38'

Conflicts:
	uk.ac.gda.epics/src/gda/device/detector/xmap/edxd/EDXDMappingController.java