Merge branch 'development' into develop/ng2-smart-table-int

src/app/theme/components/baContentTop/baContentTop.html

@@ -3,7 +3,7 @@
 
   <ul class="breadcrumb al-breadcrumb">
     <li>
-      <a href="#/pages/dashboard">Home</a></li>
+      <a routerLink="/pages/dashboard">Home</a></li>
     <li>{{ activePageTitle }}</li>
   </ul>
 </div>

src/app/theme/components/baSidebar/baSidebar.scss

@@ -8,7 +8,7 @@ $angle-right: "\f101";
   width: $sidebar-width;
   top: $top-height;
   left: 0;
-  z-index: 904;
+  z-index: 1001;
   display: block;
   min-height: 100%;
   background-color: $sidebar;

src/app/theme/sass/_ionicons.scss

@@ -1,3 +1,3 @@
-$ionicons-font-path: "~Ionicons/fonts";
+$ionicons-font-path: "~ionicons/fonts";
 
-@import "~Ionicons/scss/ionicons";
+@import "~ionicons/scss/ionicons";

src/app/theme/sass/_preloader.scss

@@ -31,7 +31,7 @@
   left: 0;
   width: 100%;
   height: 100%;
-  z-index: 1000;
+  z-index: 1003;
   background: #000000;
   & > div {
     display: block;

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';