Merge remote-tracking branch 'origin/feature/7522_remove_offspec_scripts'
Merge remote-tracking branch 'origin/feature/7503_support_line_angle'
Merge remote-tracking branch 'origin/bugfix/7526_live_data_group'
Merge remote-tracking branch 'origin/feature/7412_PeakIntensityVsRadius'
Merge remote-tracking branch 'origin/feature/7438_proxy_repo'
Merge remote-tracking branch 'origin/feature/6500_colour_change_defect'
Merge remote-tracking branch 'origin/feature/7547_dgs_utils_to_v2'
Merge remote-tracking branch 'origin/feature/5590_IDA_support_workspace_refresh'
Merge remote-tracking branch 'origin/feature/7428_ChopInMantid'
Merge remote-tracking branch 'origin/bugfix/7526_live_data_group'
Merge remote-tracking branch 'origin/feature/7545_move_lorentzian_to_widely_used_one'
re #7012 resolve conflict

Merge remote-tracking branch 'origin/feature/7012_crystal_tools'

Conflicts:
	Code/Mantid/scripts/CMakeLists.txt
Merge remote-tracking branch 'origin/feature/7484_better_language'
Merge remote-tracking branch 'origin/bugfix/7189_ConvertToMD_V2_inSysTests'
Merge remote-tracking branch 'origin/bugfix/7525_sort_workspaces_crash'
re #7558 Correct category from crystal to Crystal
re #7558 resolve merge conflict
Merge branch 'feature/7558_move_alg_category' into develop