save workplace
merge
save workplace
Merge branch 'master' of https://github.com/lisajluo/smg-server into jinxuanwu-player
fix test case
cleanup
modification
test_game.html
Merge remote-tracking branch 'origin/developer-huan-2'
Merge remote-tracking branch 'origin/container-move-2'
doOptions CORS addition
Merge branch 'master' into container-move-2

Conflicts:
	src/org/smg/server/servlet/container/NewMatchServlet.java
clean up