intensite
Merge branch 'master' of https://github.com/lecler-i/CSTT

Conflicts:
	public/js/main.js