login fixed
buy back
Merge branch 'master' into lopv2

Conflicts:
	DiamondTest-desktop/.hnydsetting/.LOP