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
replaced old IDEAS smoothmin and smoothmax functions by Annex60 counterparts
removed 'parameter' from 'replaceable parameter' in a few models, which caused warnings
added hydraulic diameter in EmbeddedPipe's flow resistance
fixed issue where building zones were using a fixed medium
removed final specifier from use_dh in pipetwoport for being able to use dh in embeddedpipe
split off A_floor for floor heating and tabs
implemented Thermostatic3WayValveExample so both legs can be hot or cold
updated example with zero flow test
changed Partial3WayValve into no reversibleflow
numerical issues with Thermostatic3WayValveExample.mo
updated RadiantSlabChar.mo and NakedTabs.mo according to new parameter A_floor in embeddedpipe
Merge branch 'Annex60' into issue50_Afloor

Conflicts:
	IDEAS/Buildings/Components/Zone.mo
Merge branch 'Annex60' into issue50_Afloor
Improving the DHW example.  DHW models seem to be wrong
Modified DHW components and unittest
DHW example with short version of DHWProfile input file.
accepted new boiler_validation unit test results