modify test-scripts
resolve conflict
.
Merge branch 'master' into develop
hydra-test+hydra-example
test benchmark integration-test
Merge branch 'master' into develop