updated test
Merge branch 'master' of https://github.com/cotrix/cotrix-gcube

Conflicts:
	cotrix-gcube/cotrix-gcube-stubs/src/test/java/org/cotrix/gcube/stubs/TestProxy.java