Adding Integration field, see #8599
Adding Zoom to detector settings, see #8600
Convert NominalMagnification into Float, see #9473
Adding code changes for new schema
Adding Tuneable (with e) Filter Type, see #7355
Adding Interleaved to Pixels, see #7309
Adding Annotator to Annotation, see #3736
Adding BigEndian to Pixels, see #7309
Adding SignificantBits to Pixels, see #8531 #7309
Merge remote-tracking branch 'gh-ome/develop' into in-steps

Conflicts:
	components/specification/test/spec/XMLMockObjects.java
	components/specification/test/spec/schema/samples/Instrument2011_06.java
	components/specification/test/spec/schema/samples/Upgrade2011_06.java
Changing type for magnification.
Merge remote-tracking branch 'gh-ome/develop' into in-steps
Merge remote-tracking branch 'gh-ome/develop' into in-steps
Revert "Adding Annotator to Annotation, see #3736"

This reverts commit 7814b092509111efa4e04b33e09641f56df8bcac.
New 2013-06 SQL
Making new values in pixels optional
Swapping types of interleaved and significantBits
Merge remote-tracking branch 'andrew/in-steps' into merged-fs-fixes