Merge branch 'combobox-directive' into sp-demo

Conflicts:
	www/index.html