refs #6865 Initial changes to possible q-frame options
refs #6865 Should allow user to choose a frame of interest in Q3D mode
refs #6865 This should fix it

e.g. enabled explicit selection of QFrame. A but more tests is still needed.
refs #6855 This should fix it

exposing Q-frame property to the algorithm interface
refs #6855 fixing weird merge artifacts in ConvertToMDComponentsTest
refs #6855 weird merge artifacts in ConvertToMD.h
refs #6855 reverting erroneous merge results
refs #6855 reverted branch to working state

with possible conflicts from W_matrix ticket remaining unsolved
refs #6855 resolving conflicts from different commits.

Merge branch 'feature/6855_ExplicitQFrame' of https://github.com/mantidproject/mantid

Conflicts:
	Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMD.h
	Code/Mantid/Framework/MDAlgorithms/test/ConvertToMDComponentsTest.h
Merge branch 'master' of https://github.com/mantidproject/mantid into feature/6855_ExplicitQFrame
refs #6855 fixed sample frame error.
refs #6855 Changed names of the frames visible in scripts&GUI

also added parameter to test if the goniometer was defined.
refs #6855 Test for new Goniometer property and use it in MDWSDescript
refs #8655 Fixed default frame selection according to goniometer.
refs #6855 this should fix the axis issues.
refs #6855 fixing tests
refs #6855 changed the target frame in the test/ConvertToMDTest.h

I wander, where this special coordinate system has been set-u. Can not find any :(
refs #6855 trivial Doxygen fixed.
Merge remote-tracking branch 'origin/feature/6855_ExplicitQFrame'