Fixing some bugs that killed the socket connection ( people using old invite codes, etc ).  Also made sure that only two people could be sharing data at a time.  Any more people will now get a notification that they are not allowed.
Merge remote-tracking branch 'origin/master' into stable