test
Merge branch 'master' of git@github.com:Continue113/sousai.git

Conflicts:
	WebContent/js/sousai.common.js