bugfix
Merge branch 'master' of github.com:ohlala/soagamble
tmp
Merge branch 'master' of github.com:ohlala/soagamble

Conflicts:
	src/com/soa/client/Client.java
	src/com/soa/service/atomic/OddsService.java