fix web
Merge remote-tracking branch 'origin/master'

Conflicts:
	wstream-web/pom.xml