Zhicheng Wang
f2dbdb3163
Merge remote-tracking branch 'origin/master'
# Conflicts:
# public/docs/_examples/cb-component-communication/e2e-spec.ts
# public/docs/_examples/cb-component-communication/ts/app/app.component.ts
# public/docs/_examples/dependency-injection/ts/app/main.1.ts
# public/docs/ts/latest/tutorial/toh-pt1.jade
# public/docs/ts/latest/tutorial/toh-pt2.jade
# public/docs/ts/latest/tutorial/toh-pt3.jade
# public/docs/ts/latest/tutorial/toh-pt4.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade