moved less and jade to devDependencies
Merge branch 'master' into upstream
Fixed indentation in gruntfile
Merge branch 'master' of https://github.com/bsc52001/AutoFate into upstream