adding item type combobox in item table
Merge branch 'nastya' into merge_branch
added item type combobox
added item type combobox