fix the always broken scenarios.js
update readme
Merge branch 'master' into mocks_file

Conflicts:
	test/e2e/scenarios.js