popup in search
Merge branch 'master' of github.com:ghulammurtaza/zippo-beta

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