Merge branch 'development' into test

Conflicts:
	server/test.js
Merge branch 'development' into test
Merge branch 'development' into test

Conflicts:
	server/test.js
Merge branch 'development' into test
Merge branch 'development' into test

Conflicts:
	server/test.js