remove unused counter of GM.
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D
Add effects when the anger is full
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D
Micro adjusting
Merge pull request #152 from RaoZiJian/master

	Add effects when the anger is full
Adjusting
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 branch 'master' of https://github.com/chukong/FantasyWarrior3D
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D
delete some unused res
Merge pull request #155 from Wu-Hao/master

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

Conflicts:
	src/BattleFieldUI.lua
Merge pull request #156 from Wu-Hao/master

	adapt for ipad
update GM.
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D

Conflicts:
	src/actors/Archer.lua
Merge pull request #157 from fusijie/master

update GM.
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D