Merge branch 'aruth' of https://github.com/dxwang/remotecollab into david
Merge branch 'david' of https://github.com/dxwang/remotecollab into aruth
blah
Added socket events
Various fixes
BUG FIXES
Merge branch 'david' of https://github.com/dxwang/remotecollab into david