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
Merge branch 'refs/heads/master' into develop
[enh] Save vehicle info on quote item
Merge branch 'refs/heads/feature/magento-476' into unlooped
[ENH] display category name in top bar if available (MAGENTO-474)
[ENH] added option for displaying the template and class as html-comment. Use options: 'dev/debug/template_hints_as_comment' and 'dev/debug/template_hints_as_comment_with_surrounding_div'
Whitespace fix
[ENH] Encourage Popover and doesn't fit message
[REF] console.log deleted
[REF] added 'px' to be clear
[ENH] fix horizontal alignment for model select encourage popover
[ref] Fitment table column sorting (MAGENTO-492)
Merge branch 'refs/heads/feature/magento-492' into unlooped
[BUG] overlay is only displayed if there is no default and no preselect set
[ref] FItment table column sorting and naming
Merge branch 'refs/heads/feature/magento-492' into unlooped