Merge remote-tracking branch 'origin/master'

Conflicts:
	TrafficSignDetection.sdf
	TrafficSignDetection.v12.suo

commit

commit