Merge pull request #251 from dburdick/swc-491

Temporary fix for tooltip issue
Added modified by to activity display SWC-492