Sorting added
Soring added to users
Merge branch 'develop' of github.com:DiKeert/devicesmgr into develop
Soring added to users