Allow inclusion of per-widget-instance dependencies
resolve conflicts between elementId and dependencies branches.

Merge branch 'master' into feature/dependency-attachment

Conflicts:
	R/htmlwidgets.R
Merge branch 'feature/dependency-attachment'