zef
Affiché activité
update
add Gestionmatériel

ajouté matériel
attribuer matériel
ajouté salle
Modif_salle
addActivity Change

ajout d'une case matériel
create displayclub
Merge pull request #1 from 3104-project-team/Romainv

Merge files pushed by romain
Affiche_salle
first implementation of panel membre
Merge branch 'panel_membre' of github.com:3104-project-team/project into panel_membre
Merge branch 'master' of github.com:3104-project-team/project into panel_membre

Conflicts:
	model/activity.php
	model/lib/databasecontroller.php
Merge pull request #5 from 3104-project-team/Romainv

Afficher materiel
update
ajout lien displayactivitys
update
update
modif for merge
up
update panel_membre