fixed zip, replaced to grunt-shell
fix conflict