playerHistory
code fix
servlet: get player info, statistic and history
Merge remote-tracking branch 'origin/developer-huan-2'
Merge remote-tracking branch 'origin/jinxuanwu-player'
Moving EndGame methods to EndGameDatabaseDriver, code cleanup
add dummy history, demo
Merge branch 'master' of https://github.com/lisajluo/smg-server into jinxuanwu-player
1.verify player already in queue, return error msg. 2.add
demo_container_v2
Moving EndGame methods to EndGameDatabaseDriver, code cleanup
Merge branch 'master' of ssh://git@github.com/lisajluo/smg-server.git
test
Merge branch 'master' into container-ruixue

Conflicts:
	src/org/smg/server/servlet/container/MatchOperationServlet.java
add matchId to winInfo
change token verify
Merge branch 'container-move-2' into container-ruixue

Conflicts:
	src/org/smg/server/servlet/container/MatchOperationServlet.java
finish demo_container_v2, change demo url to server url
Demo page - live URL
Merge remote-tracking branch 'origin/container-ruixue'
.gitignore