add dialog.
Merge branch 'master' of github.com:fusijie/FantasyWarrior3D

Conflicts:
	src/BattleScene.lua
	src/GameMaster.lua