Add company back into acl manager
Fix for multiple lists in campaign
Fix for multiple lists in campaign
fix merge conflicts