Merge branch 'master', remote branch 'origin'
Merge remote branch 'slavia/master'
Merge remote branch 'slavia/master'
Merge remote branch 'lintaillefer/master'
work ongoing
Merge remote branch 'taillefer/master'
fix typo in config file
new biosaxs plugin for ISPyB registration of HPLC experiments
Merge remote branch 'slavia/master'
Merge remote branch 'sparta/master'
Activated calculation on GPU for Fullfield XANES