Début integration
Merge branch 'master' of https://github.com/LSERRE/Dataviz-Education

Conflicts:
	templates/users/user-list-template.html