Merge branch 'develop/fluid'
deleted poor files
Merge branch 'master' into develop/fluid
fixing fluid simulation routine
before new version
some little modification