Updated App
Merge branch 'master' of https://github.com/ghulammurtaza/zippo-beta

Conflicts:
	app/design/frontend/zippo/default/template/catalog/product/bestsellers.phtml
Merge branch 'master' of https://github.com/ghulammurtaza/zippo-beta
Merge branch 'master' of https://github.com/ghulammurtaza/zippo-beta
View Page Fix
Merge branch 'master' of https://github.com/ghulammurtaza/zippo-beta

Conflicts:
	app/design/frontend/zippo/default/template/catalog/product/view.phtml
Merge branch 'master' of https://github.com/ghulammurtaza/zippo-beta
Updated App folder
Updated Skin