Replace the style checker on Make with Grunt task
Merge branch 'replace-test-style-with-grunt'