patch for MakeMove

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

Conflicts:
	src/org/smg/server/database/DummyDataGen.java
	src/org/smg/server/servlet/container/MatchOperationServlet.java
	war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	war/WEB-INF/appengine-generated/local_db.bin
Merge branch 'container-move' of https://github.com/lisajluo/smg-server into container-move

Conflicts:
	src/org/smg/server/database/DummyDataGen.java
	war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	war/WEB-INF/appengine-generated/local_db.bin