refs #4443. Solve merge conflict.
refs #7351 fixed crash in PDFFourierTransform

which is not connected to SofQ in any way but prevents me from running unit tests on Algorithms.
refs #7351 Fixed ParameterMap failing in debug mode

after replacing double if statement
It does not look like anything to do with SofQ but prevents me from running unit tests for algorithms.
refs #7351 Fixing ExtractMaskToTable which fails test in debug mode

this is nothing to do with SofQ but prevents me from running Algorithms tests in debug mode.
refs #7454 Merging conflicts.

Merge branch 'feature/7454_little_WinBugs' into develop

Conflicts:
	Code/Mantid/Framework/Geometry/src/Instrument.cpp
Merge branch 'develop' of https://github.com/mantidproject/mantid into develop