Issue43 merged annex60

Annex60 merge:
- added script for merging Annex60
- merged Annex60 sha 681079651fc3a042f4ff5011b340255d968014af
- accepted new reference results for unit tests that do not give the same results (see https://github.com/iea-annex60/modelica-annex60/issues/70)