up time + clean up
fix combine gems
Merge branch 'master' of https://github.com/tungha/DiamondTest into battleDemo

Conflicts:
	DiamondTest/src/com/cnc/diamond/battle/BattleStat.java