Merge branch 'master' into atwix_feature/core_price
Core price: changed *CD to 'core deposiit' at onestepcheckout
Core Price: removed hint "*CD - Core Deposit"
Added renderer to handle orders with empty channel field as 'website' (MAGENTO-518)
Merge branch 'atwix_feature/sales_orders_grid'
Merge branch 'atwix_feature/core_price'
Add to cart button functionality reverted to it's original core state (MAGENTO-573)
Merge branch 'atwix_hotfix/standard_addtocart' into atwix