fix bug
Merge branch 'applyDesign' of https://github.com/tungha/DiamondTest into applyDesign

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