changed logo normal, cleaned actors
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

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

Conflicts:
	src/actors/Actor.lua
try to fix camera
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/AttackCommand.lua
	src/GlobalVariables.lua
	src/actors/Rat.lua
updates
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/actors/Actor.lua
	src/actors/Piglet.lua
updated combat values
added effect resources
fixed plist, cached mage particles
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/BattleFieldUI.lua
	src/actors/Boss.lua
	src/actors/Rat.lua
fix sprite frame
Merge pull request #129 from Wu-Hao/master

1025