Submodule update
Merge branch 'master' of github.com:mxcube/mxcube
Merge branch 'master' of github.com:mxcube/mxcube
Version PX1 before update to 2.0.10
Merge branch 'soleil' of https://github.com/SOLEILPX/mxcube into soleil
Merge branch 'soleil' of https://github.com/SOLEILPX/mxcube into soleil

Conflicts solved after merge

Conflicts:
	Bricks/HutchMenuBrick.py
	Bricks/widgets/acquisition_widget.py
	HardwareObjects/EnergyScan.py
	HardwareObjects/MiniDiff.py
	HardwareObjects/SOLEIL/BLEnergy.py
	HardwareObjects/SOLEIL/TangoDCMotor.py
	HardwareRepository
 	modified:   mxcubePX1.gui
 	modified:   BlissFramework
 	modified:   Bricks/SOLEIL/HutchMenuBrickPX1.py
 	modified:   HardwareRepository
 	modified:   local_px1/SOLEIL/mxcubePX1.gui
Adapted reshape to be able to handle change in zoom
Some changes
 	modified:   ../../Bricks/SampleChangerBrick3.py
 	modified:   ../../Bricks/TreeBrick.py
 	modified:   ../EnergyScan.py
 	modified:   XfeSpectrumPX1.py
 	modified:   ../../local_px1/SOLEIL/mxcubePX1.gui
 	modified:   ../../local_px1/SOLEIL/startGUI
 	modified:   ../../local_px1/SOLEIL/xfeSpectrum.gui
Local changes for Login feature and use of CATS Robot in mxCuBE

 	modified:   BlissFramework
 	modified:   Bricks/EnergyBrick.py
 	new file:   Bricks/SOLEIL/SampleChangerBrickSoleil.py
 	new file:   Bricks/SOLEIL/SoleilLoginBrick.py
 	new file:   HardwareObjects.xml/PX1/cats.xml
 	new file:   HardwareObjects.xml/PX1/catsmaint.xml
 	new file:   HardwareObjects.xml/PX1/dbconnection-mockup.xml
 	new file:   HardwareObjects.xml/PX1/ldapconnection.xml
 	new file:   HardwareObjects/SOLEIL/CatsPX1.py
 	modified:   HardwareObjects/SOLEIL/XfeSpectrumPX1.py
 	new file:   HardwareObjects/SOLEIL/__init__.py
 	modified:   HardwareRepository
 	modified:   local_px1/SOLEIL/escan.gui
 	modified:   local_px1/SOLEIL/xfeSpectrum.gui
Better time resolution for the sub-tasks to update the sample changer status
information
Extended implementation for the CATS maintenance commands:
- handle power, regulation status and last CATS message
- brick with color-coded labels to inform about color and regulation status
Added checks whether the CATS robot arm is powered before launching
sample-transfer commands.
Using crystal info from ISPyB in processing
Repositioning the grid after zoom
Using sampx and sampy instead of hor and ver motors to calculate new position of grid
Making it possible to set the grid data through the XMLRPC server
Fixed byg from CATS integration.
Removed commented code, from earlier bug fix.