Fix compile under intellij
Add webjars support
Merge branch 'master' into java8