src/log4j.properties
login merge
player and developer merge
Gitignore changes
Merge remote-tracking branch 'origin/container-ruixue'
Merge remote-tracking branch 'origin/huan-login'
Merge branch 'master' into container-ruixue

Conflicts:
	war/WEB-INF/datastore-indexes.xml