chenged the move_goldstone_to routine to a shuffle rather than a swap.
thus preserving mass ordering amongst physical states.
Merge branch 'development' into fix-goldstone-reorder
resolved conflict.