product page remaining 6 features
Merge branch 'issue-15' into develop