Merge branch 'fix/grunt-server'