Considering grunt cli is installed globally
Merge branch 'dev' into prod