test
Merge branch 'master' of https://github.com/FesseBook/DansTesFesses
"bug commit"
Conflicts:
	ReseauSocial/src/dao/EJBGestionPost.java
	ReseauSocial/src/dao/EJBGestionUser.java
	ReseauSocial/src/servlets/Servlet1.java
test bug 2
 tristan