Merge branch 'master' into new_vfs_library

Conflicts:
	src/gameinfoimpl.cpp
	src/installationmanager.cpp
	src/mainwindow.cpp
	src/organizercore.cpp
	src/organizercore.h
	src/organizerproxy.cpp
	src/organizerproxy.h
	src/savegamegamebryo.cpp
	src/savegamegamebyro.h
	src/selfupdater.h
	src/shared/fallout3info.cpp
	src/shared/fallout3info.h
	src/shared/falloutnvinfo.cpp
	src/shared/falloutnvinfo.h
	src/shared/gameinfo.cpp
	src/shared/gameinfo.h
	src/shared/oblivioninfo.cpp
	src/shared/oblivioninfo.h
	src/shared/skyriminfo.cpp
	src/shared/skyriminfo.h
	src/spawn.cpp
	src/transfersavesdialog.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/readme.md b/readme.md
index 5965614e..e985a130 100644
--- a/readme.md
+++ b/readme.md
@@ -20,7 +20,7 @@ Here is a complete list:
 * https://github.com/TanninOne/modorganizer-lootcli

 * https://github.com/TanninOne/modorganizer-helper

 * https://github.com/TanninOne/modorganizer-tool_nmmimport

-* https://github.com/TanninOne/modorganizer-tool_pyniedit

+* https://github.com/TanninOne/modorganizer-tool_configurator

 * https://github.com/TanninOne/modorganizer-tool_inieditor

 * https://github.com/TanninOne/modorganizer-preview_base

 * https://github.com/TanninOne/modorganizer-diagnose_basic