Merge branch 'issue836' into 1.7.x
Fix gitter link
Fix gitter link
Update less4j version to 1.4.0
update less4j dependency to 1.4.0 and webjars-locator to 0.12
fix merge conflicts