when returning links to customers and orders, use the custom URL for the admin store if one exists
Merge branch 'master' of https://github.com/aingram/magento_extension into aingram-master
Merge branch 'aingram-master'