Design Fixes
Merge branch 'master' of https://github.com/ghulammurtaza/zippo-beta

Conflicts:
	app/code/local/Zippo/Search/Block/Search.php
Merge branch 'master' of https://github.com/ghulammurtaza/zippo-beta
Updated Skin
Cart Fix
sldier
Merge branch 'master' of https://github.com/ghulammurtaza/zippo-beta

Conflicts:
	app/design/frontend/zippo/default/template/catalogsearch/advanced/form.phtml
Merge branch 'master' of https://github.com/ghulammurtaza/zippo-beta
Merge branch 'master' of https://github.com/ghulammurtaza/zippo-beta
Updated skin
Updated App
Merge branch 'master' of https://github.com/ghulammurtaza/zippo-beta

Conflicts:
	app/design/frontend/zippo/default/template/catalog/product/list-outdoors.phtml