merge and clean
fully finish menu
prepare merging
stop merge: git dumb
Prepare adding chord feature
Merge branch 'master' of https://github.com/tungha/DiamondTest into resultScreen

Conflicts:
	DiamondTest-android/assets/gfx/menu.pack
	DiamondTest/src/com/cnc/diamond/Diamond.java
	DiamondTest/src/com/cnc/diamond/battle/BattleView.java
	DiamondTest/src/com/cnc/diamond/components/Game.java
	DiamondTest/src/com/cnc/diamond/setting/Score.java