GradingTool: Activity Numbers are off for branched paths

[hirokiterashima]

How to reproduce: look at grade-by-step for run 4635. See how the activity header goes from Activity 1-2->5->8->9. It should be Activity 1->2->3->4->5.

Also notice the heading in grade-by-group view. The activity numbers go up for each branch path.