test
Merge branch 'master' of https://github.com/iyou/paohuzi

Conflicts:
	client/src/app/model/FightModel.js