Develop branch test
Merge branch 'master' into develop

Conflicts:
	server.js
Merge branch 'develop'