fix current item border
Merge branch 'master' into jetty7