added crossvalidation model for pumps
merged https://github.com/Mathadon/modelica-buildings/commits/Mathadon-develop into https://github.com/lbl-srg/modelica-buildings/commits/issue209_pumpRecords because most commits were missing

changed Buildings.Fluid.Movers.BaseClasses.Characteristics.power:
Similarity law now uses a working point based on a rotational speed V_flow/r_N instead of V_flow. Only when referring to this working point then the power law P2= r_N^3*P1 is valid.

Conflicts:
	Buildings/Fluid/Movers/BaseClasses/Characteristics.mo
Merged code from Filip Matadon, added smoothing and documention.

This is for #202.

Conflicts:
	Buildings/Fluid/Movers/BaseClasses/Characteristics.mo
	Buildings/package.mo
added an example of a Nrpm pump based on a real pump for validatiion purposes

Conflicts:
	Buildings/Fluid/Movers/Examples/package.order
corrected name in revision history of Buildings.Fluid.Movers.BaseClasses.Characteristics.power
added revision history for Buildings.Fluid.Movers.Examples.FlowMachine_Nrpm_stratos
Started revising documentation and cleaned up schematic diagram.

This is for #202.
used 'delta' in Movers.BaseClasses.Characteristics.Power for handling low rpm's instead of a fixed constant to be more consistent with the rest of the implementation of movers

Conflicts:
	Buildings/Fluid/Movers/BaseClasses/FlowMachineInterface.mo
revised implementation of scaling laws in 'efficiency' similar as to previously done in 'power'

Conflicts:
	Buildings/Fluid/Movers/BaseClasses/Characteristics.mo
	Buildings/Fluid/Movers/BaseClasses/FlowMachineInterface.mo
set defaults for new parameters of function efficiency() in ControlledFlowMachine.mo:
delta=0, r_N=1, this should be backwards-compatible

Conflicts:
	Buildings/Fluid/Movers/BaseClasses/ControlledFlowMachine.mo
improved documentation of efficiency function
fixed merge error
made alterations to PumpCrossValidation model so results can be compared 1 to 1
changed nominal pressure drop and rpm in PumpCrossValidation to get a more realistic indication of the error
Assigned start values and changed algorithm to equation section
Added smoothMax to avoid an error.

This is for #286
changed r_V usage in efficiency functions to V_flow to remove dependency of the simulation results on m_flow_nominal see #209 for a more detailed explanation

a default value for the efficiency record for pumps is now calculated from the power record for consistency
corrected .order file in Movers/Data? may have been caused by bad merge
added alternative dp pump implementation
Changed c file to avoid a compile time warning