Changed way of adding admin notification to work in Magento 1.6
Merge remote-tracking branch 'origin/master'