Merge branch 'master' into Dustin
Accessory delete action moved
Merge branch 'Dustin'