fix adapters, test dumb chord
clean
Merge branch 'master' of https://github.com/tungha/DiamondTest into resultScreen

Conflicts:
	DiamondTest/src/com/cnc/diamond/adapter/DiamondChordManager.java
	DiamondTest/src/com/cnc/diamond/battle/ClientAdapter.java
clean