WIP commit
Merge remote-tracking branch 'origin/temp' into dev

Conflicts:
	common/dirs.py
	main.py
	vision/calibrator.py
	vision/calibrator_alt.py
	vision/detection.py
PROBABLY successful merge