Changes following Paths development
Merge branch 'master' of https://github.com/Ircam-RnD/matrix

Conflicts:
	client/ClientSetupSync.es6.js
	server/ServerManager.es6.js
	server/ServerPerformance.es6.js