refactoring
Merge origin/master

Conflicts:
	client/pom.xml