Merge branch 'remove-typings-traces' of https://github.com/GRoguelon/ng2-admin into GRoguelon-remove-typings-traces

Conflicts:
	Dockerfile
	docs/contents/articles/002-installation-guidelines/index.md
	docs/contents/articles/012-project-structure/index.md

src/main.browser.ts

@@ -38,7 +38,7 @@ export function main(initialHmrState?: any): Promise<any> {
  * Vendors
  * For vendors for example jQuery, Lodash, angular2-jwt just import them anywhere in your app
  * You can also import them in vendors to ensure that they are bundled in one file
- * Also see custom-typings.d.ts as you also need to do `typings install x` where `x` is your module
+ * Also see custom-typings.d.ts as you also need to do `npm install @types/x` where `x` is your module
  */
 
 

src/vendor.browser.ts

@@ -1,7 +1,7 @@
 // For vendors for example jQuery, Lodash, angular2-jwt just import them here unless you plan on
 // chunking vendors files for async loading. You would need to import the async loaded vendors
 // at the entry point of the async loaded file. Also see custom-typings.d.ts as you also need to
-// run `typings install x` where `x` is your module
+// run `npm install @types/x` where `x` is your module
 
 // Angular 2
 import '@angular/platform-browser';