First additions of controls to SXRMB beamline.
Fixed minor merge conflicts