MAGENTO-525
file permissions

fixed local file permissions so they don't keep overwriting on the
server.
MAGENTO-564
Intermediate table added to the channel data request for orders grid (MAGENTO-518)
Merge branch 'atwix_feature/sales_orders_grid' of ssh://lab.atwix.com/carpartkings
Fix for sales orders grid. Remove duplicate items from the query. (MAGENTO-568)
Merge branch 'atwix_feature/sales_orders_grid'
turn up logging

debugging order 100020651 which got the shipment recorded but did not
get marked completed. will have some extra logging now to help debug if
we see this kind of thing again.
Added grouping by sales_payment_transaction items to prevent error on duplicate records from this table. (MAGENTO-568)
Merge branch 'atwix_feature/sales_orders_grid'
Merge branch 'atwix_hotfix/feedpayment_error'
Merge branch 'master' into atwix