gridfunction geschrieben
Merge branch 'JP' into Sina

Conflicts:
	NumSimFluid.cpp