Update server_test.js
Update server_test.js
Update server_test.js
Update server_test.js
Update server.js
Update server_test.js
Merge branch 'DavidPaul-Testing' into develop

Conflicts:
	server.js