modified
modi
fix update player
Merge branch 'master' into developer-huan-2
Merge branch 'developer-huan-2' into container-ruixue
Merge remote-tracking branch 'origin/jinxuanwu-player'
1. Convert ids from/to String when get/send json from/to client. 2.
Seperate DatabaseDriver. 3. Fix id==0 bug. 4. Match entity update
modification 5. Queue entity database driver part finish 6.add game
token field to Match Entity
Merge branch 'container-move-2' into container-ruixue

Conflicts:
	src/org/smg/server/servlet/container/ContainerConstants.java
	src/org/smg/server/servlet/container/MatchOperationServlet.java