Merge branch 'hitesh/features/general'

Conflicts:
	skin/frontend/happy/default/css/happy_checkout.css
Merge branch 'master' of https://github.com/hitesh-iksula/hu

Conflicts:
	skin/frontend/happy/default/css/happy_checkout.css