Moved sort string generation to Admin -> Cleanse
Merge branch 'newdev' into test