Fix for creating datastore key with id = 0
JSON PARSING
code clean up
Merge remote-tracking branch 'origin/developer-huan-2' into developer-lisa
Staging files for Game/Developer integration, clean up DatabaseDriver
Merge remote-tracking branch 'origin/developer-lisa' into developer-huan-2
Merge remote-tracking branch 'origin/developer-lisa' into developer-huan-2
More dev/game changes
Merge remote-tracking branch 'origin/developer-lisa' into developer-huan-2
More implementation changes
Merge remote-tracking branch 'origin/developer-lisa' into developer-huan-2
code clean up
change ids to String / fields added in MatchInfo / patch for MatchOperationServlet / update GameApi

Signed-off-by: owwlo <owwlo@163.com>
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
clean up
undo war files
Channel Api support

Signed-off-by: owwlo <owwlo@163.com>
modify
modification