added grunt server task and fixed watch task