fix merge issue
Merge branch 'master' of https://github.com/dsebban/vaadin-dashboard-jetty-push