Video link change
Changes meant for master
Socket connection bug fix
Merge branch 'master' into USC