lalala

Signed-off-by: owwlo <owwlo@163.com>
Merge branch 'container-ruixue' of https://github.com/lisajluo/smg-server into container-move-2
tests

Signed-off-by: owwlo <owwlo@163.com>
patch for async play

Signed-off-by: owwlo <owwlo@163.com>
change for automatch
Merge branch 'container-move-2' into container-ruixue
Merge branch 'container-move-2' into container-ruixue
change channel token
change demo
Merge branch 'container-move-2' into container-ruixue
change demo
V5 changes
huan-v5
Merge remote-tracking branch 'origin/huan-v5'
bug fix
Merge remote-tracking branch 'origin/fei-login'
Remove user info servlet extraneous info
Smoothing user login experience
Merge remote-tracking branch 'origin/fei-login'
Bug fix, ui tweeks