fighter choice
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Controller/ArenaController.php
	app/Model/Fighter.php
	app/View/Arena/profile.ctp