Upgrading to latest VUI assets
Merge remote-tracking branch 'upstream/master' into vui-upgrade-alpha5

Conflicts:
	package.json
Merge pull request #27 from dlockhart/vui-upgrade-alpha5

Upgrading to latest VUI assets