add SetSort for findAll method
Merge branch 'develop'