Merge branch 'refs/heads/master' into brines_solutions
more changes for incompressibles
Fixed unicode characters

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
Fixed build for javascript

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
Added incompressible work from Jorrit

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
Incompressible liquids working with temperature/pressure as inputs in CPS State class

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
Fixed macros for Solutions

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>