Merge branch 'master' of https://github.com/realtimedespatch/magento-…

…orderflow

Version 1.0.0.40

Merge branch 'master' of https://github.com/realtimedespatch/orderflo…

…w-magento-module