remove salesforce folder
Merge branch 'master' into activity