correction profileView
correction profileView
correction profileView
correction profileView
Merge origin/master

Conflicts:
	ReseauSocial/nbproject/private/private.xml
	ReseauSocial/web/WEB-INF/jsp/conversationView.jsp