Merge origin/master

Conflicts:
	ReseauSocial/src/java/Controller/ProfileController.java
	ReseauSocial/web/WEB-INF/jsp/profileView.jsp