Merge branch 'master' into JP
Merge pull request #13 from jp90/master

update
simparam struct geschrieben
Merge branch 'JP'
Merge branch 'master' into Sina

Conflicts:
	NumSimFluid.cpp