Added merging of conversations to UserModel->Merge().
Merge branch 'release/2.1b1' of github.com:vanillaforums/Garden into release/2.1b1