changed interpolation type again in heat pumps as a fix is comming, see modelica track r7552 and ticket 1465
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
Merge pull request #6 from open-ideas/mergedAnnex60

Pull "merged annex60" branch in issue27_A60 branch for building solving