Merge branch 'master' into test-autorun

# Conflicts:
#	package.json
#	test/runTest/blacklist.js
#	test/runTest/cli.js
#	test/runTest/client/client.css
#	test/runTest/client/client.js
#	test/runTest/client/index.html
#	test/runTest/runtime/main.js
#	test/runTest/server.js
#	test/runTest/store.js
#	test/runTest/util.js