Merge branch 'master' of https://github.com/cryptaro/ReseauSocial2

Conflicts:
	ReseauSocial/src/java/Controller/DeconnexionController.java
	ReseauSocial/src/java/Controller/InscriptionController.java
Merge origin/master