Excalibur - set gapEnabledPVName properly
Merge remote-tracking branch 'origin/8.34' into 8.36
I13J - Get dummy mode working again. Replace ADDetector with NXDetector
I13J - Add HelpHandler and I13J Help files
Merge remote-tracking branch 'origin/8.36' into 8.36
I13I - get Zebra demo working
Setup post checkouts hooks for I13i
Create I13MJPEGView and composite to ease creation of well layed out view
I13I - Add Help Service, move sshkay, use new I13MJPEGView
I13i - Handle telnet protocol change for P2R
I13I - Add devices for nano-tomography
I13J config

Add setExposureTimeCmd for excalibur

Use ExcaliburDacScanCollectionStrategy

Tidy up areaDetector plugins for excalibur

Add NXMetaDataProvider and meta aliases

Add t1_xy, pin, diff_xy scannable

Use external browser

Add toc.html
I13J - Add devices
I13I - setup dummy mode for zebra
Add NXDetector excalibur_config_tfg
Merge remote branch 'remotes/origin/8.34'
Merge commit '6f94909cc206b371b5725839fdcadeef0a109eed'
Merge remote-tracking branch 'origin/8.36'

Conflicts:
	uk.ac.gda.beamline.i13i/META-INF/MANIFEST.MF