Merge pull request #108 from eileenmcnaughton/CRM-14007

Crm 14007 - update views for activity contact restructure
CRM-14096 civicrm.config code doesn't do a good job when civicrm not in sites/all