Simple server test.
Merge branch 'master' into develop

Conflicts:
	server.js