config before merge
Merge branch 'master' into container-ruixue

Conflicts:
	.gitignore
	war/WEB-INF/appengine-web.xml
DS query finished, add GET newMatch Servlet
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
async game / lastMove logic / getNewMatchInfo API / getState API for async play

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