change resolution
Resolution fixed
change to apply design
Merge branch 'master' of https://github.com/tungha/DiamondTest into battleEffect

Conflicts:
	DiamondTest-desktop/src/com/cnc/diamond/Main.java
Fix combo model