Added Core and Part price to different views
added core price and part price to admin order creation page
added hints for extra prices, style fixes
Extra prices: email template minor fixes
Merge branch 'master' into atwix_feature/core_price
Added new 'apply' action to admin salesrule prepare form (MAGENTO-493)
Atwix_Extraprices: added functionality for part price discount
Added core price and part price to items at order success page
Merge branch 'atwix_feature/core_price' of ssh://lab.atwix.com/carpartkings into atwix_feature/core_price
Removed code that was causing error adding product to cart
Extra prices (core price):  added core price to checkout page, changed titles
Merge branch 'master' into atwix_feature/core_price

Conflicts:
	app/design/frontend/carpartkings/default/template/catalog/product/list.phtml
	app/design/frontend/carpartkings/default/template/catalog/product/view.phtml
Core price on checkout page: added info popup
Merge branch 'master' into atwix_feature/core_price
Core price: changed *CD to 'core deposiit' at onestepcheckout
Core Price: removed hint "*CD - Core Deposit"
Merge branch 'atwix_feature/core_price'