set default nParCir=1 in embeddedPipe
fixed embeddedPipeDp example: removed deprecated argument
removed deprecated argument use_dp in EmbeddedPipe.mo example
set default number of threads in unitTests to 4
added unitTest for ZoneExample.mo
added unit test for EmbeddedPipeExample
Merge branch 'Annex60' into issue127_UnitTestCoverage

Conflicts:
	IDEAS/RunUnitTests.py
fixed zoneexample model
changed StorageWithThermostaticMixing.mo so that graphical model is clearer
changed simulation time in unit test of IDEAS/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PumpWithPipeHeatPorts.mos
accepted new reference results for unit tests during meeting with Damien and Ruben
added new reference result for IDEAS_Fluid_HeatExchangers_RadiantSlab_Examples_EmbeddedPipeExample
Merge branch 'Annex60' into issue127_UnitTestCoverage
accepted new reference resutls for shorter unit test IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_FixedResistances_Examples_PumpWithPipeHeatPorts.txt
added new reference results for ZoneExample model
updated mergeScript so that it also merges Media
merged annex60 media into IDEAS
Merge branch 'issue137_importAnnex60' into issue127_UnitTestCoverage
accepted changed reference results for valves
Updated calculation of Ideal Heating Power in BESTEST Cases