Solving merge conflicts with master#30

Merged

pdohogne-magento merged 3 commits intodevelopfrom

MasterMergeConflicts

Mar 2, 2020

Commits on Dec 20, 2019

Update README.md: Add information about releases and versioning (#24)
roribio
authored

Commits on Feb 27, 2020

SVC Release 3.0.0 (#27)

roribio
and
pdohogne-magento
authored

Commits on Mar 2, 2020

Merge remote-tracking branch 'origin/master' into develop
pdohogne-magento
committed