fixed issue2238
changed instructorFeedbackSubmit test pages
changed studentFeedbackSubmit test Pages
resolved merge conflicts