Desktop GUI Updated (MainMenuSystem and WebBrowser Component)

Config/DefaultInput.ini

@@ -161,14 +161,12 @@ DoubleClickTime=0.200000
 +ActionMappings=(ActionName="ShowContextualMenu_VR_L",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_X_Click)
 +ActionMappings=(ActionName="ShowContextualMenu_VR_R",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_A_Click)
 +ActionMappings=(ActionName="left grip",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=None)
-<<<<<<< HEAD
 +ActionMappings=(ActionName="ShowRPMBrowser",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=R)
 +ActionMappings=(ActionName="show avatar widget",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=M)
 +ActionMappings=(ActionName="toggle loader",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Z)
-=======
 +ActionMappings=(ActionName="MenuPrompt",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Tab)
 +ActionMappings=(ActionName="MenuPrompt",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Menu_Click)
->>>>>>> e766b28550f6698e6e020aa081452e12676f152e
++ActionMappings=(ActionName="ToggleMainMenu",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_Special_Right)
 +AxisMappings=(AxisName="LookUpRate",Scale=1.000000,Key=Gamepad_RightY)
 +AxisMappings=(AxisName="MoveForward",Scale=-1.000000,Key=Down)
 +AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=Gamepad_LeftY)