Quick add.
The better non erroring build.
Merge branch 'master' into AddSimpleTestServer

Conflicts:
	compile.sh
	package.json