EDITING Gruntfile with min versions
MERGING conflicts