Updated Sametime (part 5)

-Sync with SVN