Merge branch 'master' into Dustin
accessory calculation changes and db changes
Merge branch 'Dustin'