fixes NPE in filter comparison
Fixed an import
Updated vaadin lib to 6.8.13