kleine commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Joetz/Joetz.v12.suo
	Joetz/Joetz/bin/Joetz.dll
	Joetz/Joetz/bin/Joetz.pdb
	Joetz/Joetz/obj/Debug/Joetz.dll
	Joetz/Joetz/obj/Debug/Joetz.pdb