Fix Friend class to allow multiple MultiSession modules to run properly
Merge pull request #1421 from Pandra/2.0

Fix Friend class to allow multiple MultiSession modules to run properly