Displaying products

Merge displaying-products branch to master