Merge origin/master

Conflicts:
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/MCQPanel.java