Add dev dependencies to component.json
Merge branch 'master' into gh-pages