Remove video avatar and merge video hack

I took the code from our server (the one that is running), as the one on svn is broken. I haven't merged my mute/unmute thing yet. I'll work on it next.

Ing