Refine grunt watch
Upgrade dependencies
Merge branch 'dev' into features/config