Merge origin/WsClientTest into WsClientTest

Conflicts:
	pom.xml
Add CompanyDAo and Service