Renaming grunt config folder – it currently conflicts when using it in certain setups with default config name
Merging with next branch