fix(Gruntfile): Fix watchers
Merge branch 'master' into dev