fix untracked files
skill up price
Merge branch 'lopv2' of https://github.com/tungha/DiamondTest

Conflicts:
	DiamondTest-android/src/com/cnc/diamond/MainActivity.java
	DiamondTest-android/src/com/cnc/diamond/SMSHandle.java
	DiamondTest-desktop/.lop_config/.LOP
	DiamondTest/src/com/cnc/diamond/ISMSHandler.java
	DiamondTest/src/com/cnc/diamond/components/LanConnection.java
	DiamondTest/src/com/cnc/diamond/components/LoginScreen.java
	DiamondTest/src/com/cnc/diamond/components/Menu.java
	DiamondTest/src/com/cnc/diamond/components/OnlineScreen.java
	DiamondTest/src/com/cnc/diamond/components/ResultPage.java
	DiamondTest/src/com/cnc/diamond/components/StaminaDialog.java
	server
cleanup
test
Merge branch 'lopv2' of https://github.com/tungha/DiamondTest

Conflicts:
	.gitignore