merge

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

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

Conflicts:
	S1LightcycleNET.v12.suo
port changes from master

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