fixed error
Merge branch 'master' of github.com:valenitin/urbandecay.com

Conflicts:
	app/design/frontend/rwd/default/template/catalog/product/list.phtml