several fix
Merge branch 'master' of https://github.com/tungha/DiamondTest into lopv2

Conflicts:
	DiamondTest/src/com/cnc/diamond/components/Game.java