Initial commit from resources.
Merge branch 'master' into develop