Fixed roster resource list
Merge branch 'master' into plugins