update
Merge branch 'master' of https://github.com/idl-juadax/mediatheque

Conflicts:
	mediatheque/src/controller/UserController.java
	mediatheque/src/facade/Connexion.java