product page ready
Merge branch 'issue-7' into develop