Merge pull request #936 from SalesforceFoundation/feature/recurring-donations-3_1

Feature/recurring donations 3 1
Adding back line break in meta xml files
Merge pull request #943 from SalesforceFoundation/feature/meta-xml-fix

Adding back line break in meta xml files
Merge dev into feature/recurring-donations-3_1