ajout affichage categorie
Merge branch 'master' of ssh://git@github.com/Cindy-p/projetClubGit.git
categorie + ressources
dernier commit
suppression plage
Merge branch 'master' of ssh://git@github.com/Cindy-p/projetClubGit.git

Conflicts:
	projetClubGit3/WebContent/WEB-INF/index.jsp
	projetClubGit3/WebContent/conf/mox.xml