override doOption
Merge branch 'master' into container-move-2

Conflicts:
	src/org/smg/server/servlet/container/NewMatchServlet.java
clean up
modification
fix_path_url_parse
CORS addition
modification
try/catch bug fix and test_container.html
player v1 demo
try/catch fix 2
bug fix
change test_container.html static url to server url
fix: illegal property

Limit illegal property exception of player inside server since it is for
debug perpose.
Merge remote-tracking branch 'origin/developer-huan-2'
Merge remote-tracking branch 'origin/container-move-2'
Merge remote-tracking branch 'origin/jinxuanwu-player'
Dev demo