Merge origin/master

Conflicts:
	src/melt/View/ExamOverview.java
Merge pull request #15 from AoteChou/master

Merge origin/master