merged Pump_HeatPort and Pump_Insulated into Pump.mo
Merge branch 'Annex60' into issue172_pumpMerge
set default UA in pump to 1 to avoid problems with zero value
Merge pull request #214 from open-ideas/issue172_pumpMerge

merged Pump_HeatPort and Pump_Insulated into Pump.mo