product view changes
Merge branch 'code-merged' of https://github.com/Topart/new_production into code-merged-local