edit position stat
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/View/Arena/character.ctp