Merge origin/master

Conflicts:
	src/melt/View/ExamPreview.java