Merge gruntfile from step1 to step2