merge with master
Revert "merge with master"

This reverts commit 71d7f8269f535bf15e04d5035874541dac5683c0.
Added Apis Folder Plus CC Api
Merge remote-tracking branch 'origin/rushmead'
Merge rushmead