changes made on cart page by milind
Merge branch 'origin/master'
Merge branch 'origin/master'
Changes made on navigation and cart page