less modules
contract contains server and client classes
merged
merged
Merge origin/master

Conflicts:
	pom.xml