Merge branch 'hotfix/remove-scss-package'
adds the correct kadira pkg
Merge branch 'hotfix/update_kadira' into develop