fix items sorting
Merge branch 'master' into jetty7
fix items sorting when date is the same
Merge branch 'master' into jetty7