Made similar fabrics displaying on check stock dialog
Made product popup as separate magento block instead of inline
Merge branch 'master' of https://github.com/simpletaskjacob/castel_website

Conflicts:
	app/design/frontend/castel/default/template/catalog/product/view.phtml
	app/design/frontend/castel/default/template/catalog/product/view/media.phtml