added grunt clean
fixed merge