merge cafeberry/main (keep ported KBM input)

4J_Input/Windows64/INP_Main.h

@@ -169,10 +169,13 @@ public:
 
     unsigned int **m_JoypadMap;
 
+	bool m_bSelectBackSwapped;
+
     bool m_bJoypadMapArrayIsSetup;
     unsigned int m_uiSigninJoypadMask;
     bool m_bIsMenuDisplayed[MAX_JOYPADS];
 
+	EControllerType m_LastControllerType;
     CForceFeedback m_ForceFeedback;
     CKeyboard m_Keyboard;