* add admin whitelist
Merge branch 'dev' into distributed_deployment