Merge branch 'ceg1236-feat/grunt-bowercopy'