Code Enhancement return
sync

don't know why i need to commit this
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/View/Arenas/halloffame.ctp