Merge branch 'events'
Merge branch 'master' into product_to_item
Renamed most product to item
Removed product left overs
Merge branch 'product_to_item'