Zhicheng Wang 8136953a09 Merge branch 'en-master' into aio ... # Conflicts: # aio/content/examples/dynamic-component-loader/src/app/ad-banner.component.ts # aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.ts # aio/content/examples/upgrade-module/src/systemjs.config.1.js # aio/content/guide/aot-compiler.md # aio/content/guide/architecture-components.md # aio/content/guide/architecture-modules.md # aio/content/guide/architecture-next-steps.md # aio/content/guide/architecture-services.md # aio/content/guide/architecture.md # aio/content/guide/bootstrapping.md # aio/content/guide/cheatsheet.md # aio/content/guide/comparing-observables.md # aio/content/guide/component-styles.md # aio/content/guide/dependency-injection-in-action.md # aio/content/guide/dependency-injection.md # aio/content/guide/deployment.md # aio/content/guide/docs-style-guide.md # aio/content/guide/dynamic-component-loader.md # aio/content/guide/elements.md # aio/content/guide/glossary.md # aio/content/guide/hierarchical-dependency-injection.md # aio/content/guide/http.md # aio/content/guide/lifecycle-hooks.md # aio/content/guide/ngmodule-faq.md # aio/content/guide/npm-packages.md # aio/content/guide/observables.md # aio/content/guide/providers.md # aio/content/guide/quickstart.md # aio/content/guide/reactive-forms.md # aio/content/guide/releases.md # aio/content/guide/router.md # aio/content/guide/service-worker-config.md # aio/content/guide/service-worker-devops.md # aio/content/guide/service-worker-getting-started.md # aio/content/guide/service-worker-intro.md # aio/content/guide/setup.md # aio/content/guide/singleton-services.md # aio/content/guide/styleguide.md # aio/content/guide/testing.md # aio/content/guide/typescript-configuration.md # aio/content/guide/universal.md # aio/content/guide/updating.md # aio/content/guide/upgrade.md # aio/content/marketing/features.html # aio/content/navigation.json # aio/content/tutorial/toh-pt0.md # aio/content/tutorial/toh-pt3.md # aio/content/tutorial/toh-pt4.md # aio/content/tutorial/toh-pt5.md # aio/content/tutorial/toh-pt6.md # aio/package.json # aio/src/app/documents/document.service.ts # aio/src/app/layout/doc-viewer/doc-viewer.component.ts # aio/src/app/shared/toc.service.ts # aio/tools/transforms/templates/api/base.template.html # aio/yarn.lock		2018-05-15 23:26:31 +08:00
..
src	Merge branch 'en-master' into aio	2018-05-15 23:26:31 +08:00