projet complet
Merge remote-tracking branch 'origin/master' into Thomas

Conflicts:
	.gitignore
	www/ambiance/AmbianceCtrl.js
	www/ambiance/ambiance.html
	www/commons/router.js
	www/exercice/exercice.scss
	www/index.html
projet complet le 8/08/14