Update the resource list
Merge branch 'development'