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
Merge pull request #6 from rleigh-dundee/new-map-fixes

Correct code generation and MapPairs serialisation
ome-xml: Only store schema version as a property
ome-xml: MapPairs obtains schema version from model properties
cpp: MapPairs uses current model version