v1
Merge origin/master

Conflicts:
	src/noten/NewApplication.java