Add grunt-contrib-less instead of grunt-contrib-sass
Merge remote-tracking branch 'upstream/master'