Updated resources.
Merge branch 'develop'