* add cb to func whitelist in whitelist.js
Merge branch 'dev' into distributed_deployment