maven pom file
correcting previous commit, where some compile code was committed
files and folders to be ignored
Merge branch 'upstream-master' into develop
working example with ini files that map bruker parameters with ontology terms
adding more parameters from the acquisition parameter list. Added the fid byte array to the nmrML. Fixing the way I read the acqu file in order to avoid redundancy.
new method to load the sourcefiletype using the filenames stored in the bruker.ini
Merge branch 'upstream-master' into develop

Conflicts:
	.gitignore

New updates after the hackathon in Halle.
update of the automatically generated classes based on the new version of the nmrML.sxd file. Correction to the converter package, AcquReader class had disappeared.
Merge branch 'upstream-master' into develop

Conflicts:
	.gitignore

updates from the main branch of nmrML
one last change from all to sequence and remove an unsupported option to get xjc compiling.
updating the model to use the most recent nmrML schema.
update the acqu reader to use the new classes. Tests seem to be working
Merge branch 'upstream-master' into develop

Conflicts:
	.gitignore

updates from nmrML repo
Merge branch 'master' into develop
new classes from model, probably from previous update to the xsd
Merge branch 'master' of https://github.com/LuisFF/nmrML into develop
nmrML example of a reference spectra recorded with a Bruker spectrometer
nmrML example of a reference spectra recorded with a Bruker spectrometer, now located in the examples folder.
Corrections to the ontology references and terms. New features to the SourceFileType such as sha1 hashing.