Merge pull request #933 from SalesforceFoundation/feature/799-health-check-and-settings-work

Feature/799 health check and settings work
Updating version number in version.properties.
Changes from running "ant updateMetaXml".
Merge pull request #936 from SalesforceFoundation/feature/recurring-donations-3_1

Feature/recurring donations 3 1
Merge dev into feature/799-health-check-and-settings-work