merge
Merge branch 'master' of https://github.com/S1Lightcycle/Lightcycle_ObjectTracking

Conflicts:
	S1LightcycleNET.v12.suo
	S1LightcycleNET/Program.cs
	S1LightcycleNET/bin/Debug/S1LightcycleNET.exe
	S1LightcycleNET/bin/Debug/S1LightcycleNET.pdb
	S1LightcycleNET/obj/Debug/S1LightcycleNET.csproj.FileListAbsolute.txt
	S1LightcycleNET/obj/Debug/S1LightcycleNET.csprojResolveAssemblyReference.cache
	S1LightcycleNET/obj/Debug/S1LightcycleNET.exe
	S1LightcycleNET/obj/Debug/S1LightcycleNET.pdb
merge

Signed-off-by: Nepetalactone <tobias.meusburger@gmx.net>
Merge branch 'master' of https://github.com/S1Lightcycle/Lightcycle_ObjectTracking

Conflicts:
	S1LightcycleNET.v12.suo
	S1LightcycleNET/bin/Debug/S1LightcycleNET.exe
	S1LightcycleNET/bin/Debug/S1LightcycleNET.pdb
	S1LightcycleNET/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	S1LightcycleNET/obj/Debug/S1LightcycleNET.csproj.FileListAbsolute.txt
	S1LightcycleNET/obj/Debug/S1LightcycleNET.exe
	S1LightcycleNET/obj/Debug/S1LightcycleNET.pdb
Refactor for WPF

Signed-off-by: Nepetalactone <tobias.meusburger@gmx.net>