Merge branch 'development' into walkabout

Conflicts:
	Engine/source/T3D/aiPlayer.cpp

Templates/Full/game/tools/gui/guiDialogs.ed.cs

@@ -35,6 +35,7 @@ exec("./GuiEaseEditDlg.ed.cs");
 exec("./guiObjectInspector.ed.cs");
 exec("./uvEditor.ed.gui");
 exec("./objectSelection.ed.cs");
+exec("./guiPlatformGenericMenubar.ed.cs");
 
 if (isDemo())
    exec("./messageBoxOKBuy.ed.gui");

Templates/Full/game/tools/gui/guiPlatformGenericMenubar.ed.cs

@@ -0,0 +1 @@
+exec("./guiPlatformGenericMenubar.ed.gui");

Templates/Full/game/tools/gui/guiPlatformGenericMenubar.ed.gui

@@ -0,0 +1,14 @@
+//--- OBJECT WRITE BEGIN ---
+%guiContent = new GuiControl(PlatformGenericMenubar) {
+   profile = "GuiModelessDialogProfile";
+      
+   new GuiPlatformGenericMenuBar()
+   {
+      internalName = "menubar";
+      extent = "1024 32";
+      minExtent = "320 32";
+      horizSizing = "width";
+      profile = "GuiMenuBarProfile";
+   };
+};
+//--- OBJECT WRITE END ---

Templates/Full/game/tools/gui/profiles.ed.cs

@@ -1063,3 +1063,15 @@ singleton GuiControlProfile( GuiCreatorIconButtonProfile )
    //bevelColorLL = "0 0 0";
    category = "Editor";
 };
+
+singleton GuiControlProfile( GuiMenuBarProfile )
+{
+   fillcolor = "255 255 255";
+   borderColor = "0 0 0";
+   border = 1;
+   borderThickness = 1;
+   opaque = true;
+   mouseOverSelected = true;
+   category = "Editor";
+   bitmap = "tools/gui/images/checkbox-menubar";
+};