Master Branch committing

Test
1. opening video added.
2. conversation added for 3 characters.
3. test script added when game start.
4. CCScrollView scroll with animation issue resolved.
m

m
 push
y
1. unnecessary code removed
test

 test
test

test
Merge branch 'dev' of https://github.com/chaucyzhang/emblemKnight into dev

Conflicts:

emblemKnight.xcodeproj/project.xcworkspace/xcuserdata/administrator.xcus
erdatad/UserInterfaceState.xcuserstate
	emblemKnight/Classes/IntroScene.m
1. battle scene added
1. battle scene added
as
aas
Merge remote-tracking branch 'origin/dev' into dev
1.battle scene UI update.
2.alliance and enemy commander’ name and avatar icons added on battle scene.
battle scene die animation added
Merge pull request #1 from chaucyzhang/dev

Dev