Optimize gruntfile
Merge branch 'feature/dependency-management'

* feature/dependency-management:
  Optimize gruntfile