create displayclub
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
update
ajout lien displayactivitys
update
update
up
update panel_membre
up2
Merge pull request #6 from 3104-project-team/Guillaume

Guillaume
up3
up
merge
Merge branch 'panel_membre' of github.com:3104-project-team/project into panel_membre
Merge pull request #9 from 3104-project-team/panel_membre

Panel membre
Bdd
New BDD
addMateriel work