added commodity to items table
merged master into items
items table commodity field error fixed