Rework userManager to add matching of webrtc clients and socket.io clients.

Signed-off-by: Baptiste Millou <baptiste@smoothie-creative.com>
Merge branch 'master' of github.com:Sheeprider/yourcube

Signed-off-by: Baptiste Millou <baptiste@smoothie-creative.com>

Conflicts:
	www/index.html
	www/static/css/yourcube.css
	www/static/js/user.js
	www/static/js/video.js