Working watch and less grunt file
Merge branch 'master' into upstream