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