merged in lates user-stream
Merge in master, fix package.json conflicts"

Conflicts:
	package.json
Make serve directive rely on less and browser directives