keep trace of reskin.
Merge branch 'master' of github.com:fusijie/FantasyWarrior3D

Conflicts:
	src/ChooseRoleScene.lua
Merge branch 'master' of github.com:fusijie/FantasyWarrior3D