Merge origin/master

Conflicts:
	Synthese/Synthese-ejb/src/java/session/ClientFacade.java
Merge origin/master