Fix for None-type excpetion in case of empty string tag
added missing import
Merge pull request #54 from olofsvensson/master

Fix for None-type excpetion in case of empty string tag
close shutter after 10 seconds instead of 3
close shutter after 5 minutes instead of 3 seconds
Merge branch 'master' of github.com:mxcube/mxcube

Conflicts:
	HardwareObjects/AbstractMultiCollect.py
Improved layout of grid widget
Merge branch 'master' of github.com:mxcube/mxcube

Conflicts:
	Bricks/widgets/ui_files/grid_row_widget.ui
Changed the order of width and height
The is operator might not work with hardware objects, changing it for ==
might solve the "not connected to LDAP" problem.
Adding generation of hkl200 files
Removed duplicate signal connection
Missed the raw_data directory
Making it possible to configure the valid input ranges from beamline-setup.xml
Making it possible to configure the valid input ranges from beamline-setup.xml
Merge branch 'master' of github.com:mxcube/mxcube

Conflicts:
	Bricks/widgets/acquisition_widget.py
Merge branch 'master' into massif1

Conflicts:
	Bricks/widgets/acquisition_widget.py