Merge dev into feature/add-weblinks
Merge pull request #544 from SalesforceFoundation/dev

Merge feature/409
Change from Weblink to WebLink to match package.xml element
Merge pull request #545 from SalesforceFoundation/feature/add-weblinks

Change Weblinks to WebLinks