Merge branch 'master' into vfx-demo

Editor/NewSceneWindow/NewSceneWindow.cs

         {
             using (new GUILayout.HorizontalScope())
             {
-                    GUILayout.Label("Available Templates", EditorStyles.boldLabel, GUILayout.Width(188));
-                    GUILayout.Label("Description", EditorStyles.boldLabel);
+                GUILayout.Space(8);
+                GUILayout.Label("Available Templates", EditorStyles.boldLabel, GUILayout.Width(188));
+                GUILayout.Label("Description", EditorStyles.boldLabel);
+                GUILayout.Space(8);
-                GUILayout.Space(8);
+                GUILayout.Space(4);
+                GUILayout.Space(4);
             }
             using (new GUILayout.HorizontalScope())
             {
                 }
 
                 EditorGUI.EndDisabledGroup();
+                GUILayout.Space(4);
+            GUILayout.Space(8);
         }
 
         static void CreateSceneFromTemplate(SceneAsset template, bool append = false)
             }
 
             GUILayout.FlexibleSpace();
+
+            if(selectedTemplate.ScreenShot != null)
+            {
+                GUILayout.Box(GUIContent.none, GUILayout.ExpandWidth(true), GUILayout.Height(180));
+                Rect r = GUILayoutUtility.GetLastRect();
+                RectOffset off = new RectOffset(6, 6, 6, 6);
+                r = off.Remove(r);
+                EditorGUI.DrawPreviewTexture(r, selectedTemplate.ScreenShot, null, ScaleMode.ScaleAndCrop);
+            }
         }
 
         static class Styles

Editor/NewSceneWindow/SceneTemplateList.cs

         public string Description;
         [NonNullCheck]
         public SceneAsset Scene;
-
+        public Texture2D ScreenShot;
     }
 }