DM14: Feedback and fixes done on 12th and 13th
Merge branch 'milestones/desktopmay14' of https://github.com/hitesh-iksula/hu into milestones/desktopmay14

Conflicts:
	app/design/frontend/happy/default/template/explore/sidebars/checkout_cart.phtml