Merge branch 'master' into dev

Conflicts:
	controleurs/StatistiqueControleur.class.php
	vues/StatistiqueVue.class.php

resolution de commit de conflit
Commentaire pour Tutoriel.js
Merge branch 'dev' of https://github.com/silviapopa1/genie-en-ligne into silviapopa1-dev

Conflicts:
	vues/StatistiqueVue.class.php

Resolution de conflits
Merge branch 'silviapopa1-dev' into dev