Fixed org list.
fixed user org and group remove.
Merge branch 'test' into dev
Build.