Merge remote-tracking branch 'origin/bugfix/7212_ms_vs_incorrect'
Merge remote-tracking branch 'origin/bugfix/7160_splatterplot_colorscale_issues'
Merge remote-tracking branch 'origin/feature/7192_LoadEventNexus_progress'
Merge remote-tracking branch 'origin/feature/7119_LoadSassena_initDocs'
Merge remote-tracking branch 'origin/feature/7158_splatterplot_default_rep'
Merge remote-tracking branch 'origin/feature/7220_update_Fit_wiki'
Merge remote-tracking branch 'origin/bugfix/7077_algorithm_property'
Merge branch 'master' of github.com:mantidproject/mantid
Merge remote-tracking branch 'origin/feature/6743_nacl_script'
Merge remote-tracking branch 'origin/feature/7148_splatterplot_pick_mode'
Merge remote-tracking branch 'origin/bugfix/7210_MantidEV_exception_without_peaks_workspace'
Merge remote branch 'origin/feature/7214_mpi4py_replaces_boostmpi'
Merge remote-tracking branch 'origin/feature/6191_remove_spectradetectormap'
Merge remote-tracking branch 'origin/bugfix/7202_mdalg_test_file_cleanup'
Merge remote branch 'origin/feature/6856_ConvertToDiffractionMDWS_v2'

Conflicts:
	Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp

Re #6856.
Re #7226. Add additional dependencies to qtassistant target.

This should ensure that it is built after all shared libraries have been.
(As this target actually runs Mantid there was a problem with it opening
libraries that another parallel running target is building).
Merge branch 'feature/7226_qtassistant_build_order' into develop

Re #7226.
Conflicts:
	Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp