1020
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/BattleScene.lua
using pig model
Merge pull request #53 from Wu-Hao/master

1020