ran Annex60 merge script for Annex60 SHA ecf565dc654a11d14250cf6e89184d28e1b9b452
this commit contains al modifications, no additions
added all new files from Annex60 merge
removed files that were added accidentaly
added merging script to repository
updated annex60 implementation to ecf565dc654a11d14250cf6e89184d28e1b9b452
merged Annex60 up to commit 681079651fc3a042f4ff5011b340255d968014af
merged files of Annex60 branch (681079651fc3a042f4ff5011b340255d968014af) into git and updated unit test reference results: needed to accept some changes (see https://github.com/iea-annex60/modelica-annex60/issues/70)
removed sh.exe.stackdump file from repository
Merge branch 'mergedAnnex60' into Annex60

Conflicts:
	IDEAS/Fluid/HeatExchangers/package.order
	IDEAS/Utilities/Math/Functions/BaseClasses/package.mo
	IDEAS/Utilities/Math/Functions/Examples/package.mo
	IDEAS/Utilities/Math/Functions/package.mo
	IDEAS/Utilities/Math/Functions/package.order
	IDEAS/package.order