Remove sales order view admin block rewrite and move to an observer to prevent issues with other 3rd party/custom extensions
Merge branch 'master' of https://github.com/Sevenly/magento_extension into Sevenly-master
Merge branch 'Sevenly-master'