patch for channel logic / channel api demo

Signed-off-by: owwlo <owwlo@163.com>
Merge branch 'container-move-2' of https://github.com/lisajluo/smg-server into container-move-2

Conflicts:
	war/demo_channel_api.html
patch for MakeMove: get currentPlayerId through accessSignature

Signed-off-by: owwlo <owwlo@163.com>
Merge branch 'master' into container-ruixue
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
bug fix in MakeMove for operations

Signed-off-by: owwlo <owwlo@163.com>
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
Merge remote-tracking branch 'origin/jinxuanwu-player'
Entity property fix
Merge remote-tracking branch 'origin/jinxuanwu-player'