test
test
VERSION TWO PIC REFORMAT
Merge branch 'developer-huan-2' of https://github.com/lisajluo/smg-server into developer-huan-2
PIC REFORMAT
bugfix: same state for two players

Signed-off-by: owwlo <owwlo@163.com>
Merge branch 'master' into container-move-2
config before merge
Merge branch 'master' into container-ruixue

Conflicts:
	.gitignore
	war/WEB-INF/appengine-web.xml
MakeMove return json changed: add matchId / change gameState to state

Signed-off-by: owwlo <owwlo@163.com>
Merge remote-tracking branch 'origin/jinxuanwu-player'
Merge remote-tracking branch 'origin/jinxuanwu-player'
src/log4j.properties
login merge
DS query finished, add GET newMatch Servlet
config .gitignore
Merge branch 'container-move-2' into container-ruixue
async game / lastMove logic / getNewMatchInfo API / getState API for async play

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