Minor updates.
Merge branch 'master' of https://github.com/gustavla/vision-research

Conflicts:
	detector/listanno.py
	writeups/cad-support/support-handling.tex