merge Chris's version on moveGrandParent,

still haven't merge s1.unity correctly