Merge pull request #2 from olofsvensson/1.0

Replaced spinbox with text
change energy first, then change resolution (fixes MXSUP-1550)
removed need for SMIS_BEAMLINE_NAME env. variable;
replaced by beamline_name property in dbconnection xml file
Fixed a small bug the hardware objects always return false when regarded
as a bool, so all() will always return false.
Fixed a small bug the hardware objects always return false when regarded
as a bool, so all() will always return false.
Merge branch '1.0' of git://github.com/mxcube/mxcube into 1.0
adapted for fast mesh (MD2 4d scan)
Merge branch '1.0' of github.com:mxcube/mxcube into 1.0
updated submodule
prevent error at startup with resolution calculation when det. radius
is not initialized yet
prevent error at startup with resolution calculation when det. radius
is not initialized yet
Merge branch '1.0' of github.com:mxcube/mxcube into 1.0

Conflicts:
	HardwareObjects/Resolution.py
Fixed bug for scan4dm to be set only if possible.
bug fix with 4d scan
in case unloading fails in the java device server task,
don't stay blocked
updated to latest HWR
updated to latest HWR
Do not allow 4d scan if overlap!
More explicit message for the mesh.
updated to latest BlissFramework
Merge branch '1.0' of github.com:mxcube/mxcube into 1.0

Conflicts:
	Bricks/DataCollectBrick2.py