merge

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

Conflicts:
	S1LightcycleNET.v12.suo