test
hi
Xianlei fix conflict

Merge remote-tracking branch 'origin/master'

Conflicts:
	war/WEB-INF/appengine-web.xml
	war/WEB-INF/web.xml