Grunt tasks

merging grunt tasks