Fix observer
Merge branch 'dev' of github.com:EcomDev/EcomDev_PHPUnit into dev