Test Change
updated consumer secret
Merge branch 'master' of github.com:forcedotcom/SalesforceCanvasFrameworkSDK