Updated Sametime (part 4)

-Sync with SVN