changement requetes
Resolution de conflits

Merge branch 'master' of https://github.com/Hahuha/drunken-batman

Conflicts:
	depot/ajout_adherent_form.php
	facture/imprimer_facture_form.php
	index.php
	liste_ouvrage/ajout_classe_form.php
	liste_ouvrage/edit_lycee_form.php
	liste_ouvrage/list_ouvrage_form.php
	liste_ouvrage/view_etab.php
	retrait/ajout_adherent_form.php
	retrait/vendre_manuel_form1.php
	retrait/vendre_manuel_form1_na.php
	script/script_classe.php
Résolution des conflits

Merge branch 'master' of https://github.com/Hahuha/drunken-batman

Conflicts:
	depot/ajout_adherent_form.php
	facture/imprimer_facture_form.php
	index.php
	liste_ouvrage/ajout_classe_form.php
	liste_ouvrage/edit_lycee_form.php
	liste_ouvrage/list_ouvrage_form.php
	liste_ouvrage/view_etab.php
	retrait/ajout_adherent_form.php
	retrait/vendre_manuel_form1.php
	retrait/vendre_manuel_form1_na.php
	script/script_classe.php