Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D
optimized piglet and dragon appear pos.
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D

Conflicts:
	frameworks/cocos2d-x/cocos/platform/android/java/project.properties
	frameworks/runtime-src/proj.android/project.properties
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D
Merge pull request #142 from Wu-Hao/master

	fix battle camera offset, cleanup
Add Slime and replace new scene model. :)
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D

Conflicts:
	src/GlobalVariables.lua
	src/actors/Slime.lua
Merge pull request #143 from fusijie/master

add slime to battle and update scene model.
scene change to grey when hero does special attack
Merge pull request #144 from calfjohn/master

scene change to grey when hero does special attack
fix time bug and add particle when herowalk
Merge pull request #145 from zaojiahua/master

fix time bug and add particle when hero walk
boss
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D
fix loading path bug
Merge pull request #146 from zaojiahua/master

fix loading path bug
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D
walkpuff fix
add new arrow