Merge
Merge branch 'master' of https://github.com/antoinechalifour/StudeasyWeb

Conflicts:
	app/js/studeasy/newproject.js