Merge branch 'vanessa'

Conflicts:
	app/views/player-profile.blade.php