Merge pull request #3 from jp90/Dave

Merge pull request #2 from jp90/master
Merge pull request #4 from jp90/master

ich will aktuellen stand
dave2. und jp noch dazu
Merge pull request #5 from jp90/Dave

Dave der 3.
Merge branch 'JP'

Conflicts:
	NumSimFluid.cpp
Merge pull request #7 from jp90/master

dave uptodate