put images in proper structure for skins folders
Merge branch 'master' into release-2.0