Merge remote-tracking branch 'gg/development' into gtest-tests

Engine/source/platform/platform.h

@@ -338,6 +338,9 @@ namespace Platform
    // display Splash Window
    bool displaySplashWindow( String path );
 
+   // close Splash Window
+   bool closeSplashWindow();
+
    void openFolder( const char* path );
 
    // Open file at the OS level, according to registered file-types.

Engine/source/platform/platformInput.h

@@ -118,9 +118,6 @@ public:
 
    static U8 getModifierKeys() {return smModifierKeys;}
    static void setModifierKeys(U8 mod) {smModifierKeys = mod;}
-
-   static void attemptSwitchToKeyboardLayout( U32 layout );
-
 #ifdef LOG_INPUT
    static void log( const char* format, ... );
 #endif