merge for online
Merge branch 'master' of https://github.com/tungha/DiamondTest into lopv2

Conflicts:
	DiamondTest/src/com/cnc/diamond/adapter/DiamondInternetManager.java
stamina dialog
dumb session
Merge branch 'master' into lopv2
tested facebook