Merge branch 'master' of https://github.com/angular/angular-cn

public/_includes/_hero-home.jade

@@ -8,5 +8,5 @@ header(class="background-sky l-relative")
      announcement-bar
       .announcement-bar-slide.clearfix
         img(src="/resources/images/logos/anglebrackets/anglebrackets.png" width="64")
-        p 参加十月25号到28号在<strong>洛杉矶召开的Anglebrackets大会!</strong>
+        p 参加十月25号到28号在<strong>拉斯维加斯召开的Anglebrackets大会!</strong>
         a(href="https://anglebrackets.org/#!/" target="_blank" class="button md-button") 立即注册

public/_includes/_scripts-minimum.jade

@@ -22,6 +22,3 @@ script.
 <!-- Google Feedback -->
 script(src="//www.gstatic.com/feedback/api.js" type="text/javascript")
 
-<!-- Twitter Widget -->
-script.
-  (function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}})(document,"script","twitter-wjs");

public/docs/ts/latest/guide/npm-packages.jade

@@ -163,7 +163,7 @@ a(id="polyfills")
 .l-main-section
 :marked
   ### Polyfill packages
-  ### 填充(Polyfile)包
+  ### 填充(Polyfill)包
   
   Angular requires certain [polyfills](https://en.wikipedia.org/wiki/Polyfill) in the application environment.
   Install these polyfills using the npm packages that Angular lists in the *peerDependencies* section of its `package.json`.