Added test to avoid error due to different length in reference results for HeatPort.
Added test that is needed when merging models from the Annex60 library.
Resolved conflict.
corrected wrong order of arguments in print statement.
Merge pull request #12 from lbl-srg/master

Merge master to release branch