Zhimin YE (Rex)
654030f09d
Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
# public/docs/ts/latest/cookbook/dependency-injection.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/guide/user-input.jade
# public/docs/ts/latest/guide/webpack.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/toh-pt2.jade
# public/docs/ts/latest/tutorial/toh-pt4.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade