Merge remote-tracking branch 'origin/bugfix/6879_DirectEnergy_ARCS'
Merge remote-tracking branch 'origin/master' into feature/970_python_fitfunctions Refs #970

Conflicts:
	Code/Mantid/Framework/PythonInterface/test/python/PythonAlgorithms/CMakeLists.txt
Move added Python algorithms to new location. Refs #970
Merge branch 'feature/970_python_fitfunctions' into develop. Refs #970

Conflicts:
	Code/Mantid/Framework/PythonInterface/test/python/PythonAlgorithms/CMakeLists.txt