Added Product list custom cell
Merge conflicts fixed