Added missing configuration file beamline-setup.xml
Merge branch 'master' of github.com:mxcube/mxcube