Merge branch 'master-jun18'
drwxr-xr-x - css
drwxr-xr-x - images
drwxr-xr-x - js
drwxr-xr-x - xml