Merged in layout changes from old trial template org
- Added back quick actions
- Removed references to Gender__c unpackaged field and GW_Volunteers__*
Merge branch 'dev' into feature/template-layouts

Conflicts:
	src/layouts/Account-Household Layout.layout
Merge pull request #824 from SalesforceFoundation/dev

Merge conflict merging dev into feature/template-layouts
Fix manual merge which duplicated Notes related list
Merge branch 'feature/template-layouts' of github.com:SalesforceFoundation/Cumulus into feature/template-layouts
Merge pull request #816 from SalesforceFoundation/feature/template-layouts

Merged in layout changes from old trial template org
Merge dev into feature/485-cinnamon-tests