Modifs DAO
Merge branch 'master' of
https://github.com/zerock54/MyStudyCompanion.git

Conflicts:
	admin/controleur/index.php