Merge origin/master

Conflicts:
	Net_Articles/Net_Articles-ejb/src/java/session/ClientFacade.java
résolu :)