2.1 weer werkend
Merge remote-tracking branch 'origin/Tom' into Tom

Conflicts:
	main.cpp