work on the running of the tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/templates/running/scenario.xhtml
work on the executors