Merge remote branch 'origin/2.0'

Conflicts:
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp

src/plugins/git/gitplugin.h

@@ -109,7 +109,8 @@ private slots:
     void logFile();
     void blameFile();
     void logProject();
-    void undoFileChanges();
+    void undoFileChanges(bool revertStaging = true);
+    void undoUnstagedFileChanges();
     void undoRepositoryChanges();
     void stageFile();
     void unstageFile();