added actorTestScene
Merge pull request #100 from calfjohn/master

2 commits
Merge pull request #101 from Wu-Hao/master

added actorTestScene
update knight reskin.
update knight reskin.
Merge branch 'master' of github.com:fusijie/FantasyWarrior3D
modify dropblood to hpcounter and fix button bugs
Merge pull request #102 from zaojiahua/master

modify dropblood to hpcounter and fix button bugs
completed archer reskin.
Merge branch 'master' of github.com:fusijie/FantasyWarrior3D

Conflicts:
	frameworks/cocos2d-x/cocos/custom/EffectSprite3D.cpp
	src/main.lua
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/actors/Piglet.lua