1st NEWUI commit
Merge branch 'NEWUI' of https://github.com/tungha/DiamondTest

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