Merge pull request #536 from SalesforceFoundation/feature/409-address-mgmt

misc fixes
Add weblinks to package.xml generation
Change from Weblinks to WebLinks to match generated elements
Merge pull request #539 from SalesforceFoundation/feature/add-weblinks

Add WebLink metadata type to package.xml generation
Merge branch 'dev' of https://github.com/SalesforceFoundation/Cumulus into feature/409-address-mgmt
Merge branch 'feature/409-address-mgmt' of https://github.com/SalesforceFoundation/Cumulus into feature/409-address-mgmt

Conflicts:
	lib/ant-salesforce.xml