merge

Signed-off-by: Nepetalactone <tobias.meusburger@students.fhv.at>
Merge branch 'master' of https://github.com/Nepetalactone/S3VR

Conflicts:
	S3ObjectDetector_cpp/ConsoleApplication1/Release/ConsoleApplication1.log
	S3ObjectDetector_cpp/ConsoleApplication1/Release/S3ObjectDetector.obj
	S3ObjectDetector_cpp/ConsoleApplication1/Release/vc110.pdb
	S3ObjectDetector_cpp/ConsoleApplication1/S3ObjectDetector.cpp
	S3ObjectDetector_cpp/Release/S3ObjectDetector.exe
	S3ObjectDetector_cpp/Release/S3ObjectDetector.pdb
	S3ObjectDetector_cpp/S3ObjectDetector.sdf
	S3ObjectDetector_cpp/S3ObjectDetector.v11.suo
asdf

Signed-off-by: Nepetalactone <tobias.meusburger@students.fhv.at>
Merge branch 'master' of https://github.com/Nepetalactone/S3VR

Conflicts:
	S3ObjectDetector_cpp/S3ObjectDetector.sdf
	S3ObjectDetector_cpp/S3ObjectDetector.v11.suo
asdf

Signed-off-by: Nepetalactone <tobias.meusburger@students.fhv.at>
Merge branch 'master' of https://github.com/Nepetalactone/S3VR

Conflicts:
	S3ObjectDetector_cpp/ConsoleApplication1/Release/CL.read.1.tlog
	S3ObjectDetector_cpp/S3ObjectDetector.sdf
	S3ObjectDetector_cpp/S3ObjectDetector.v11.suo
ip

Signed-off-by: Nepetalactone <tobias.meusburger@students.fhv.at>