test webservice
Merge branch 'master' of ssh://git@github.com/H4313/serverv2.git

Conflicts:
	serverHttp/src/com/h4313/deephouse/webservice/TestWebService2.java