Merged changes
Fixed compilation error in tests
Added webjars initialization