Merge branch 'master' into Dustin
no quantity bug fixed
Merge branch 'Dustin'
Merge branch 'master' into marty