Creating the collect dict after the motor position have been set.
So that that the positions will be stored in ISPyB.
Add CATS compatibility for sample-transfer operations in the data collection
tree brick.
To be simplified (and made more pythonic) after switching to the new
GenericSampleChanger API with the SC3 at the ESRF. ;-)
Merge branch 'master' of github.com:mxcube/mxcube
Highlighting selected shapes.
Handling beamsize and scale for the grid
submodule update
Using 0 as default values and not None
Waiting for result of get_beam_info
Attempt to handle resize of beam
Submodule update
Submodule update
Handling the case when drawing mgr is not set
set position of beam for rectangular beam display (slitbox) using the new set_xMid_yMid method (Qub)
Merge branch 'bessy_dev_cats' of https://github.com/hellmig/mxcube into hellmig-bessy_dev_cats

Conflicts:
	Bricks/widgets/dc_tree_widget.py
	HardwareObjects/queue_entry.py
Refactored the code to make it more qub friendly
Submodule update
Moving the grid as the sample moves.
Submodule update
Adapted reshape to be able to handle change in zoom
Merge branch 'master' into massif1

Conflicts:
	BlissFramework