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

Conflicts:
	gv/parts_descriptor.py