Added code that was removed by accident in a previous commit.
Merge branch 'master' of github.com:mxcube/mxcube

Conflicts:
	HardwareObjects/queue_entry.py