Added the composite object for the beamline setup.
Merge branch 'master' of github.com:mxcube/mxcube

Conflicts:
	Bricks/TaskToolBoxBrick.py
Fixed indentation