random gonna be finished
Merge branch 'master' into lopv2

Conflicts:
	DiamondTest/src/com/cnc/diamond/Diamond.java
	DiamondTest/src/com/cnc/diamond/adapter/DiamondInternetManager.java
	DiamondTest/src/com/cnc/diamond/online/ServerSideRegister.java
debug
test online
Merge branch 'lopv2' of https://github.com/tungha/DiamondTest into lopv2

Conflicts:
	DiamondTest/src/com/cnc/diamond/adapter/DiamondInternetManager.java
	DiamondTest/src/com/cnc/diamond/components/OnlineScreen.java
	DiamondTest/src/com/cnc/diamond/online/OnlineFunctions.java
	DiamondTest/src/com/cnc/diamond/online/ServerSideRegister.java