Merge branch 'master' into Dustin
Summary except for the accessories

Waiting on confirmation on Warranty/Accessories requirements
Merge branch 'Dustin'