Merge pull request #128 from eko/develop

SONATA-405 - Fix product variations categories synchronization
SONATA-416 - Fix delivery step template submit bar alignment