Cherry-pick the uglification & SASS build changes from Angular branch
Update dependencies
Merge changes from master branch