Add map base types and MapAnnotation, see #11341
Add GenericSource using the Map type, see #11344
Add MapAnnotation to templates
Adding MapPairs class (from rleigh)
Merge in Xsd-Fu changes from develop and fix build
Merge remote-tracking branch 'origin/develop' into new-map

Conflicts:
	components/specification/released-schema/2013-10-dev-1/omeOxygenProject.xpr
	components/specification/samples/develop/2013-10to06-downgrade.ome
	components/specification/transforms/2013-10-dev-1-to-2013-06.xsl
	pom.xml
Merge remote-tracking branch 'origin/develop' into new-map
xsd-fu: Map is not a primitive type
ome-xml: Reindent MapPairs
ome-xml: MapPairs contains a Map and provides a getter for it
cpp: ome-xml: Add MapPairs class
Add LongAnnotations to FakeReader
Merge pull request #5 from rleigh-dundee/new-map-fixes

Fixes for cpp map and java map primitives
Added parameters annLong and annDouble

Test using:
./showinf -omexml -nopix dummy\&series=2\&sizeZ=5\&annLong=2\&annDouble=3.fake

Each of the 2 images will then have 2 long annotations and 3 double annotations,
so 10 annotations in total. The values are calculated from the annotation number
so are different but consistant for any filename.

This will allow me to add the map annotation very quickly.
Merge branch 'new-map' of github.com:qidane/bioformats into new-map
Correcting white space
Correcting whitespace mk2
Minor reformating
xsd-fu: Ignore M, K and V elements in headers, sourcedeps and forward declarations
ome-xml: Append child M elements to MapPairs