[MAGEMEP-133] fixed shipping price issue which made problems on some shipping methods
Merge branch 'development' of github.com:Flagbit/Magento-MEP into development