update vendors.json
Merge branch 'develop'

Conflicts:
	app/scripts/app.coffee