Merge pull request #759 from SalesforceFoundation/feature/npo02-v3

Upgrade to Households 3.0
Added Global-Global Layout.layout to the metadata white list to prevent
its deletion
Merge pull request #761 from SalesforceFoundation/feature/do-not-delete-global-layout

Don't delete Global-Global Layout.layout in build
Merge dev into feature/npo02-v3