Added Primary_Contact__c formula field on Contact
Update package.xml to include Contact.Primary_Contact__c
Merge pull request #972 from SalesforceFoundation/feature/971-primary-contact-formula

Added Primary_Contact__c formula field on Contact
Merge pull request #958 from SalesforceFoundation/dev

Merge latest from dev (new Primary Contact field) into feature/883-hierarchical-custom-settings-2