Merge branch 'master' into master-merge

diff --cc radiant/commands.cpp
Simple merge

diff --cc radiant/main.cpp
index 20bea80fde8533800f6a74ef0f68226c95c745d6,87fa8470e1b063da7c2db420a47b2878c2b7ac67..1306de6ced97407633f403b96768ef26eb7baaf7
--- 1/radiant/main.cpp
--- 2/radiant/main.cpp
+++ b/radiant/main.cpp
@@@ -497,36 -495,9 +495,34 @@@ void user_shortcuts_init()
  }
  
  void user_shortcuts_save(){
-       StringOutputStream path( 256 );
-       path << SettingsPath_get() << g_pGameDescription->mGameFile.c_str() << '/';
-       SaveCommandMap( path.c_str() );
+       SaveCommandMap();
  }
  
 +void add_local_rc_files(){
 +#define GARUX_DISABLE_GTKTHEME
 +#ifndef GARUX_DISABLE_GTKTHEME
 +/* FIXME: HACK: not GTK3 compatible
 + https://developer.gnome.org/gtk2/stable/gtk2-Resource-Files.html#gtk-rc-add-default-file
 + https://developer.gnome.org/gtk3/stable/gtk3-Resource-Files.html#gtk-rc-add-default-file
 + > gtk_rc_add_default_file has been deprecated since version 3.0 and should not be used in newly-written code.
 + > Use GtkStyleContext with a custom GtkStyleProvider instead
 +*/
 +
 +      {
 +              StringOutputStream path( 512 );
 +              path << AppPath_get() << ".gtkrc-2.0.radiant";
 +              gtk_rc_add_default_file( path.c_str() );
 +      }
 +#ifdef WIN32
 +      {
 +              StringOutputStream path( 512 );
 +              path << AppPath_get() << ".gtkrc-2.0.win";
 +              gtk_rc_add_default_file( path.c_str() );
 +      }
 +#endif
 +#endif // GARUX_DISABLE_GTKTHEME
 +}
 +
  /* HACK: If ui::main is not called yet,
  gtk_main_quit will not quit, so tell main
  to not call ui::main. This happens when a