fixed attribute sorting across all attributes, closes #645
Merge branch 'master' of github.com:concrete5/concrete5-5.7.0