added notifications sorting
Merge branch 'develop'