Merge branch 'master' into Dustin
Waste added to squares, plywood saving to db
Merge branch 'Dustin'
Merge branch 'master' into marty