Update listening port from 5000 to 8080
Merge remote-tracking branch 'origin/staging' into staging
 -
 -
 -
Merge branch 'develop' into staging

Conflicts:
	index.html
Merge branch 'develop' into staging to use Bootstrap.

Conflicts:
	index.html