updates dependencies
Merge branch 'develop' into gh-pages

* develop:
  updates dependencies