Add Grunt init for starting, also correct some issue since the merging.