Merge branch 'master' into vanchi/sentinel2

Conflicts:
	server/server.js
	tests/client.presence.test.js