upgrade to support java8, change `sort` to `sort2`

Because Java 8 has b build-in `sort` to List interface, fava changed
`sort` to `sort2`, it ugly but works.