Athletics Promo Items + Fixes
Merge branch 'Aug-8-1436'