fix refuse 2
Merge branch 'master' of https://github.com/tungha/DiamondTest into chordMerge

Conflicts:
	DiamondTest-android/assets/gfx/menu.pack
	DiamondTest-android/assets/gfx/menu.png
	DiamondTest-android/assets/gfx/menu2.png
	DiamondTest/src/com/cnc/diamond/Diamond.java
post fixed
Merge branch 'chordMerge' of https://github.com/tungha/DiamondTest
merged, full