load resource with RGB565 in BattleScene and with AUTO in other scene
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D
Adjusting
fixed a bug in showDialog
Merge pull request #153 from calfjohn/master

load resource with RGB565 in BattleScene and with AUTO in other scene
Merge pull request #154 from RaoZiJian/master

Adjusting
Merge pull request #155 from Wu-Hao/master

delete some unused res
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D

Conflicts:
	src/BattleFieldUI.lua