GDA-5883 ScanDataPoint scan number is now an int
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git

Conflicts:
	uk.ac.gda.api/jars/gda-corba.jar
	uk.ac.gda.api/src/gda/scan/Scan.java
	uk.ac.gda.core/src/gda/jython/JythonServer.java
	uk.ac.gda.core/test/gda/data/scan/datawriter/DummyDataWriter.java
	uk.ac.gda.core/test/gda/scan/ContinuousScanTest.java
GDA-5883 Scan and ScanDataPoint now use an int for scan number
added comment about GDA-5883