merge with new lib
spine apply is done
Merge branch 'master' of https://github.com/tungha/DiamondTest into lopv2

Conflicts:
	DiamondTest-desktop/.lop_config/.LOP
	DiamondTest/src/com/cnc/diamond/Diamond.java
	DiamondTest/src/com/cnc/diamond/components/Game.java
	DiamondTest/src/com/cnc/diamond/components/StaminaDialog.java
	DiamondTest/src/com/cnc/diamond/ui/DragList.java