modif gruntfile + tests
fix conflict