Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	lib/loader.js
	lib/middleware.js
	package.json
	test/resources/client-test/bootstrapScript.js
	test/resources/client-test/clientTest.js
	test/resources/client-test/resourceLoader.js
	test/resources/client-test/testnamespace/dependency1.js