I13 - sample motors are in microns, add float cameras
Merge remote-tracking branch 'origin/8.36'

Conflicts:
	i13i/clients/main/common.xml
	i13i/clients/main/float2.xml
	i13i/servers/main/common.xml
	i13i/servers/main/live/live_server_common.xml
	uk.ac.gda.beamline.i13i/plugin.xml