changes by nishant for category-page
Merge branch 'origin/master'
changes by nishant 2 for category-page