Merge branch 'hotfix/2.6.3'
fixing grunt-contrib dependency
Merge branch 'master' into develop - fixing grunt-contrib