Merge dev into feature/273-static-resource
Merge pull request #586 from SalesforceFoundation/feature/273-static-resource

Feature/273 static resource
Merge dev into feature/sprint13-misc-fixes