Merge branch 'container-move-2' of https://github.com/lisajluo/smg-server
Merge branch 'container-move-2' of https://github.com/lisajluo/smg-server into container-move-2
make up new emails and game name
fix update player
change demo page
Merge branch 'master' into container-ruixue

Conflicts:
	war/test_container.html
change domo container link in index.html
make test cases work for container_v1

Signed-off-by: owwlo <owwlo@163.com>
Merge branch 'container-move-2' of https://github.com/lisajluo/smg-server into container-move-2
Merge branch 'container-move-2' of ssh://git@github.com/lisajluo/smg-server.git into container-move-2
small changes for container-v1 test

Signed-off-by: owwlo <owwlo@163.com>
Merge branch 'container-move-2' of ssh://git@github.com/lisajluo/smg-server.git into container-move-2
Merge branch 'container-move-2' into container-ruixue
Merge branch 'developer-huan-2' into container-ruixue
Merge remote-tracking branch 'origin/jinxuanwu-player'