Merge remote-tracking branch 'origin/Dave'
Merge branch 'master' into JP
Merge pull request #13 from jp90/master

update
simparam struct geschrieben
Merge branch 'JP'
Merge branch 'master' into Dave
Merge branch 'Dave' of https://github.com/jp90/src into Dave

Conflicts:
	NumSimFluid.cpp