Merge pull request #78 from mantidproject/feature/10624_wish_7_panel_idf

Add a WISH definition for the 7 panel configuration.
Merge remote-tracking branch 'origin/feature/8924_Intrument_file_repo'
Merge branch 'master' into feature/8990_loading_monitors_or_not_in_load_event_nexus

Conflicts:
	Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors.h

Two methods were added in the same place, but they are not conflicting
Merge remote-tracking branch 'origin/bugfix/10607_isis_sans_display_mask_throws_error_on_sans2d_data'
Merge branch 'master' into feature/8990_loading_monitors_or_not_in_load_event_nexus
Merge branch 'feature/8990_loading_monitors_or_not_in_load_event_nexus' into develop

Conflicts:
	Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors.h

Two methods added in the same place, but compatible