Merge pull request #872 from eileenmcnaughton/master

CRM/ACL/API.php

CRM/ACL/BAO/ACL.php

CRM/ACL/BAO/Cache.php

CRM/ACL/BAO/EntityRole.php

CRM/ACL/Form/ACL.php

CRM/ACL/Form/ACLBasic.php

CRM/ACL/Form/EntityRole.php

CRM/ACL/Page/ACL.php

CRM/ACL/Page/ACLBasic.php

CRM/ACL/Page/EntityRole.php

CRM/Activity/BAO/ActivityAssignment.php

CRM/Activity/BAO/ActivityTarget.php

CRM/Activity/BAO/ICalendar.php

CRM/Activity/BAO/Query.php

CRM/Activity/Form/Task/FileOnCase.php

CRM/Activity/Form/Task/PickOption.php

CRM/Activity/Form/Task/PickProfile.php

CRM/Activity/Form/Task/SearchTaskHookSample.php

CRM/Activity/Import/Parser.php

CRM/Activity/Page/AJAX.php