joining room + presenter basic - x2 channels bug
second commit
Merge branch 'master' of github.com:overlox/openhangouts

Conflicts:
	public/system/controllers/dashboard.js
	public/system/controllers/video.js
	public/system/services/webrtc.js
	server/routes/socket/socket.js