Merge remote-tracking branch 'origin/Thomas'

Conflicts:
	www/commons/router.js
Merge branch 'master' into Thomas
Son d'ambiance fonctionnel
Merge pull request #4 from tom9010/Thomas

Thomas