Schema moving from 2013-10-dev-2 to 2013-10-dev-3
Expanding list of annotatable objects(3) see #11342
Remove annotations from Pixels and WellSample
Add to upgrade sample SA to be removed
Transform WellSample and Pixels annotations
Strip new AnnotationRef elements on downgrade

Conflicts:
	components/specification/samples/develop/2013-10to06-downgrade.ome
Add AnnotationRef to Shape, with Transform
Code changes: annotation on abstract proprietary
Revert the removal of the WellSample AnnotationRef

Conflicts:
	components/specification/transforms/2013-06-to-2013-10-dev-1.xsl
Update MetadataConverter and fix old tests
Update test named 2010-04 to Current to match use

Conflicts:
	components/bio-formats/test/loci/formats/utests/InOut201004Test.java
	components/bio-formats/test/loci/formats/utests/InOutCurrentTest.java
	components/formats-gpl/test/loci/formats/utests/InOut201004Test.java
Adding Instrument Annotation test
Adding Detector Annotation test
Adding Objective Annotation test
Adding Filter and Dichroic Annotation tests
Adding range of light source annotation tests
Merge in Xsd-Fu changes and fix build (Part 1)
Check ABSTRACT_PROPRIETARY_OVERRIDE on creation
Update import of OMEXMLMetadataRoot in test
Updating asXMLElement Java template