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