finish auth
Merge branch 'master' into lopv2

Conflicts:
	DiamondTest/src/com/cnc/diamond/Diamond.java
	DiamondTest/src/com/cnc/diamond/online/ServerSideRegister.java
	DiamondTest/src/com/cnc/diamond/setting/Setting.java