CRM-10043 - merge in changes to Activity.tpl and splitting of ActivityJs.tpl with the follow-up assignee changes.
CRM-10043 - one more fatal fix - ts w/o array.
Merge pull request #2333 from davecivicrm/CRM-10043

CRM-10043 - merge in changes to Activity.tpl and splitting of ActivityJs...