Merge branch 'atwix_hotfix/ga_XSS'
Merge branch 'atwix_hotfix/standard_addtocart'
Merge branch 'atwix_feature/sales_orders_grid'
Core Price: added info pop-ups, core price checker fix
core price: price list adjust for product view
Merge branch 'atwix_feature/core_price_fixes_improovements' into atwix

Conflicts:
	app/design/frontend/carpartkings/default/template/catalog/product/list.phtml
	app/design/frontend/carpartkings/default/template/catalog/product/view.phtml
	skin/frontend/carpartkings/default/css/styles.css