make up new emails and game name
Demo pages update
Demo pg - fix
change demo page
Merge branch 'master' into container-ruixue

Conflicts:
	war/test_container.html
change domo container link in index.html
Merge branch 'container-move-2' of ssh://git@github.com/lisajluo/smg-server.git into container-move-2
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