Merge branch 'master' of pixhawk.ethz.ch:qgroundcontrol into experimental

src/uas/UASWaypointManager.cc

@@ -400,6 +400,7 @@ void UASWaypointManager::saveWaypoints(const QString &saveFile)
 
     for (int i = 0; i < waypoints.size(); i++)
     {
+        waypoints[i]->setId(i);
         waypoints[i]->save(out);
     }
     file.close();