Product entity
Merge branch 'product' into develop