Merge dev into feature/721-allocations
Renamding campaign layout to fix build issues.
Merge branch 'feature/721-allocations' of github.com:SalesforceFoundation/Cumulus into feature/721-allocations
Merge pull request #1170 from SalesforceFoundation/feature/721-allocations

Feature/721 allocations