Signed-off-by: bliss administrator <blissadm@p1-id29new.esrf.fr>
Merge branch 'master' of github.com:mxcube/mxcube
Merge branch 'master' of github.com:mxcube/mxcube
Merge branch 'master' of github.com:mxcube/mxcube
Merge branch 'master' of github.com:mxcube/mxcube
Added more latency to safety_shutter_close_task
Merge branch 'master' of github.com:mxcube/mxcube
Merge branch 'master' of github.com:mxcube/mxcube
Merge branch 'master' of github.com:mxcube/mxcube
small refactoring, session creation is all done in ISPyBClient2 object
Added a snapshots count combobox to confirm dialog
Merge pull request #71 from IvarsKarpics/master

Added a snapshots count combobox to confirm dialog
Changed Energy and Resolution bricks layout for better visibility. (MG, AB)
Merge branch 'master' into massif1
Merge branch 'master' of github.com:mxcube/mxcube
Merge branch 'embl-hh'
added 'set_plate_mode' method to confirm dialog
fixed typo
removed logging message for each frame
added SAD resolution into account
Revert "small refactoring, session creation is all done in ISPyBClient2 object"

This reverts commit 3a3d45fe7c37a9a2a2391340ec17ca4c4171e8b8.