no negativ beting
Merge branch 'master' of github.com:ohlala/soagamble

Conflicts:
	src/com/soa/client/Client.java
	src/com/webapp/client/SOAGamble2.java
	src/com/webapp/client/WorkflowService.java
	src/com/webapp/client/WorkflowServiceAsync.java
	src/com/webapp/server/WorkflowServiceImpl.java
	war/js/App.js