add some new commands
Merge branch 'master' of https://github.com/tungha/DiamondTest into battleEffect

Conflicts:
	DiamondTest/src/com/cnc/diamond/game/Logic.java