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
Merge branch 'feature/6855_ExplicitQFrame' of https://github.com/mantidproject/mantid into develop