Cleaning up merge of 2.8 into develop

Fixed broken merge in ProblemGrader and also removed tracking of development.yml from git.