Altered:
- Moved BioXAS Pseudomotor includes to the correct .pri file
- BioXASSideBeamline to have a I2 Detector and Keithly
- Changed BioXASSideMonochromator to I22 from I21 and commented out check for connected on some :opr:close pvs

Added:
- BioXASSideXASScanController now adds I2 as a default detector
- NB I2 is on scaler channel 15

Removed:
- setupDetectors() call from beamline constructor to inside of setupComponents to stop detector from being used by scaler for channel reference
Fixed minor merge conflict.