Merge branch 'social-media-integration' into dev
Added 'Upsell' Class