Add AngularJS
Added minified versions of Angular for us. Better for performance.
Fixed merged conflicts