Merge branch 'JP'

Conflicts:
	NumSimFluid.cpp
Merge branch 'master' into JP

Conflicts:
	NumSimFluid.cpp