Add the type on the item admin class
Merge remote-tracking branch 'origin/master'