Avatar slider
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/View/Arenas/sight.ctp