Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D
Sharp  the resources
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D
Merge pull request #157 from fusijie/master

update GM.
Rat values
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D
pack mainmenuscene resource and finish victory logic
Merge pull request #158 from zaojiahua/master

pack mainmenuscene resource and finish victory logic
Merge pull request #159 from calfjohn/master

set android frame buffer to 565
set android frame buffer to 565
add import
Merge pull request #160 from calfjohn/master

add import
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D
Add dragon effects
Merge pull request #161 from RaoZiJian/master

	Sharp the resources
add Boss.
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D

Conflicts:
	src/BattleFieldUI.lua