Merge branch 'master' of github.com:cciteam/Oenline

Conflicts:
	dossierControleur/OenlineControleur.php
	dossierVue/homeEspaceMembre.php
	dossierVue/homeJeu.php
	dossierVue/homeVinsReferences.php

Signed-off-by: ingrid1990 <ingrid_awounou@hotmail.fr> ajout des cours
conflit
Merge branch 'master' of github.com:cciteam/Oenline

Conflicts:
	dossierControleur/OenlineControleur.php
	dossierVue/Oenline.css

Signed-off-by: ingrid1990 <ingrid_awounou@hotmail.fr>