Merge remote-tracking branch 'upstream/master'

test
Now with small mcstas_event.h5 test file
Now with small mcstas_event.h5 test file
New LoadMcStasNexusTest.h
New     CMakeLists.txt
Merge branch 'master' of git://github.com/trnielsen/mantid into feature/7393_mcstas_event

Refs #7393
Conflicts:
	Code/Mantid/Framework/DataHandling/CMakeLists.txt
uncomment loadill. re #7393
Remove reference to doneAddingEventLists. re #7393

No longer needed see #7176
Merge remote-tracking branch 'origin/master' into feature/7393_mcstas_event
Merge remote-tracking branch 'origin/bugfix/7402_using_removed_property'
Merge remote-tracking branch 'origin/feature/7263_improve_load_selection_performance'

Refs #7263
Conflicts:
	Code/Mantid/Framework/DataHandling/src/LoadEventNexus.cpp
	Code/Mantid/Framework/DataHandling/src/LoadSassena.cpp
Merge remote-tracking branch 'origin/master' into feature/7393_mcstas_event
Use new hdf loader approach. re #7393

and changed some formatting
Merge branch 'feature/7393_mcstas_event' into develop