Merge branch 'hotfix/product-fix2'
fixing about page
Merge branch 'hotfix/about' into develop