Fixes option components for newest API
Merge branch 'master' of https://github.com/volusion-angular/toolbox-common