remove obsolete resources from roster storage
Merge branch 'master' into resource-picker