gitignore public/uploads
Merge branch 'ui' into Socket_Interfacing

Conflicts:
	.gitignore
Fix for user who joined via URL auto-rejoining.
Disallow entering blank chat message (serverside)
Reworked what happens on hostdc.
Merge branch 'Socket_Interfacing' into ui

Conflicts:
	extensions/sockets/handler.js