BattleScene-Character

character moving
BattleScene Character

character move
Merge remote-tracking branch 'origin/master'

Conflicts:
	Library/metadata/d7/d7490f8c04db07344ba9dde23d686ae7
	touchAOS.userprefs