galerie && modifier profi
Galerie nouvelle version
Merge branch 'GroupeA'
new version galerie
Merge branch 'GroupeA' of https://github.com/PPIL2014/main into GroupeA

Conflicts:
	nbproject/private/private.properties
	nbproject/project.properties
	src/conf/persistence.xml
	src/java/NewServletListener.java
	src/java/control/ContactsBean.java
	src/java/control/GaleriesBean.java
	web/afficherGalerie.xhtml
	web/afficherImage.xhtml
	web/ajouterGalerie.xhtml
	web/ajouterImage.xhtml
	web/confirmEditProfil.xhtml
	web/editProfil.xhtml
	web/listeAmis.xhtml
	web/listeGaleries.xhtml
Merge branch 'GroupeA'