adding xml saving/loading for submissions/marking
adding xml saving/loading for submissions/marking
merged conflict by using their version