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

Conflicts:

	Joetz/Joetz.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Joetz/Joetz.v12.suo
	Joetz/Joetz/bin/Joetz.dll
	Joetz/Joetz/bin/Joetz.pdb
	Joetz/Joetz/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Joetz/Joetz/obj/Debug/Joetz.csproj.FileListAbsolute.txt
	Joetz/Joetz/obj/Debug/Joetz.csprojResolveAssemblyReference.cache
	Joetz/Joetz/obj/Debug/Joetz.dll
	Joetz/Joetz/obj/Debug/Joetz.pdb
Merge branch 'master' of https://github.com/CharlotteErpels1993/TI3_GC05_Project

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