update deps
Merge branch 'master' into relatedmodels

Conflicts:
	public/js/src/config.js