DM14: Delivery option functionality rectification
Merge branch 'milestones/desktopmay14' of https://github.com/hitesh-iksula/hu into milestones/desktopmay14

Conflicts:
	app/design/frontend/happy/default/template/onepagecheckout/onepage/shipping_method/available.phtml
	skin/frontend/happy/default/js/happy.js
	skin/frontend/happy/default/js/happy_checkout.js