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, 3 insertions, 2 deletions

diff --git a/src/modlist.cpp b/src/modlist.cpp
index 197250a3..9d7f32c8 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -24,15 +24,14 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "qtgroupingproxy.h"

 #include "viewmarkingscrollbar.h"

 #include "modlistsortproxy.h"

-#include <gameinfo.h>

 #include <appconfig.h>

 #include <utility.h>

 #include <report.h>

+

 #include <QFileInfo>

 #include <QDir>

 #include <QDirIterator>

 #include <QMimeData>

-#include <stdexcept>

 #include <QStandardItemModel>

 #include <QMessageBox>

 #include <QStringList>

@@ -44,7 +43,9 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QAbstractItemView>

 #include <QSortFilterProxyModel>

 #include <QApplication>

+

 #include <sstream>

+#include <stdexcept>

 #include <algorithm>