initial draft of classes that will read the acquisition files
Merge branch 'develop' of https://github.com/LuisFF/nmrML into read-acquisition-file
Merge branch 'develop' into features

Conflicts:
	tools/Parser_and_Converters/Java/src/main/java/org/nmrml/converter/BrukerAcquAbstractReader.java

took the code from the development branch. had to correct the AcquReader class.
Moved the method that loads the bruker file location into a separate class.
consider the case when the sourcefilelist is not loaded
Merge branch 'develop' into load-source-files

Conflicts:
	tools/Parser_and_Converters/Java/src/main/java/org/nmrml/converter/AcquReader.java
	tools/Parser_and_Converters/Java/src/main/java/org/nmrml/converter/BrukerAcquAbstractReader.java

update to the model
created a unit test for the BrukerSourceFileListLoader
sourceFile loading is now done completely in a class external to the reader.
add more important file locations
Merge branch 'develop' of https://github.com/LuisFF/nmrML into features

Conflicts:
	tools/Parser_and_Converters/Java/src/main/java/org/nmrml/converter/BrukerAcquAbstractReader.java

update the ono.ini file with terms that will probably be included in the NMR ontology referring to the additional source files
command line converter with new option for contact.