update code
Merge branch 'master' of https://github.com/ghulammurtaza/zippo-beta

Conflicts:
	app/design/frontend/zippo/default/template/catalog/product/list-outdoors.phtml
test
Merge branch 'master' of https://github.com/ghulammurtaza/zippo-beta
Merge branch 'master' of https://github.com/ghulammurtaza/zippo-beta
Merge branch 'master' of https://github.com/ghulammurtaza/zippo-beta
other categories pages
Merge branch 'master' of https://github.com/ghulammurtaza/zippo-beta

Conflicts:
	app/design/frontend/zippo/default/template/catalog/product/view.phtml
outoor listing popup added
delete media and cacha
commit
Merge branch 'master' of https://github.com/ghulammurtaza/zippo-beta

Conflicts:
	app/design/frontend/zippo/default/template/catalog/product/list.phtml
List Page Update