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

Conflicts:
	src/BattleScene.lua
	src/Mage.lua
Merge pull request #46 from Wu-Hao/master

1019