Merge remote-tracking branch 'origin/master' into feature/5421_IDA_bayes_interface

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
	Code/Mantid/scripts/Inelastic/IndirectBayes.py

Refs #5421
Merge remote-tracking branch 'origin/master' into feature/5421_IDA_bayes_interface

Conflicts:
	Code/Mantid/scripts/Inelastic/IndirectBayes.py

Refs #5421
Refs #5421 More updating bayes for GUI.
Merge branch 'feature/5421_IDA_bayes_interface' into develop

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
	Code/Mantid/scripts/Inelastic/IndirectBayes.py

Refs #5421