Small fixes.
Merge branch 'develop' of https://github.com/volusion-angular/toolbox-common into develop