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