new version
5000 -> 8080
Merge branch 'staging'

Conflicts:
	web.js