diff --git a/package.json b/package.json
index 6f422d5f..c2b683c2 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "amcharts3": "github:amcharts/amcharts3",
     "ammap3": "github:amcharts/ammap3",
-    "angular2": "2.0.0-beta.16",
+    "angular2": "2.0.0-beta.17",
     "bootstrap": "^4.0.0-alpha.2",
     "bootstrap-loader": "^1.0.8",
     "chartist": "^0.9.7",
@@ -21,7 +21,7 @@
     "leaflet-map": "^0.2.1",
     "ng2-charts": "^1.0.3",
     "normalize.css": "^4.1.1",
-    "rxjs": "5.0.0-beta.2",
+    "rxjs": "5.0.0-beta.6 ",
     "tether": "^1.2.4",
     "zone.js": "~0.6.11"
   },
diff --git a/src/app/pages/dashboard/feed/feed.html b/src/app/pages/dashboard/feed/feed.html
index f6a2535c..eb050c22 100644
--- a/src/app/pages/dashboard/feed/feed.html
+++ b/src/app/pages/dashboard/feed/feed.html
@@ -1,5 +1,5 @@
 <div class="feed-messages-container">
-  <div class="feed-message" *ngFor="#message of feed" (click)="expandMessage(message)">
+  <div class="feed-message" *ngFor="let message of feed" (click)="expandMessage(message)">
     <div class="message-icon" *ngIf="message.type == 'text-message'">
       <img class="photo-icon" src="{{ ( message.author | profilePicture ) }}">
     </div>
diff --git a/src/app/pages/dashboard/pieChart/pieChart.html b/src/app/pages/dashboard/pieChart/pieChart.html
index d11485f4..f354e901 100644
--- a/src/app/pages/dashboard/pieChart/pieChart.html
+++ b/src/app/pages/dashboard/pieChart/pieChart.html
@@ -1,6 +1,6 @@
 <div class="row pie-charts">
 
-  <ba-card *ngFor="#chart of charts" class="pie-chart-item-container col-xlg-3 col-lg-3 col-md-6 col-sm-12 col-xs-12">
+  <ba-card *ngFor="let chart of charts" class="pie-chart-item-container col-xlg-3 col-lg-3 col-md-6 col-sm-12 col-xs-12">
 
     <div class="pie-chart-item">
       <div class="chart" [attr.data-rel]="chart.color" data-percent="60">
diff --git a/src/app/pages/dashboard/todo/todo.html b/src/app/pages/dashboard/todo/todo.html
index 33087494..1041202b 100644
--- a/src/app/pages/dashboard/todo/todo.html
+++ b/src/app/pages/dashboard/todo/todo.html
@@ -3,7 +3,7 @@
 <div class="box-shadow-border"></div>
 
 <ul class="todo-list">
-  <li *ngFor="#item of getNotDeleted()" [ngClass]="{checked: item.isChecked, active: item.isActive}" class="{{ getMarkColor(item.markId) }}"
+  <li *ngFor="let item of getNotDeleted()" [ngClass]="{checked: item.isChecked, active: item.isActive}" class="{{ getMarkColor(item.markId) }}"
       (mouseenter)="item.isActive=true" (mouseleave)="item.isActive=false">
 
     <div class="blur-container"><div class="blur-box"></div></div>
diff --git a/src/app/pages/dashboard/trafficChart/trafficChart.html b/src/app/pages/dashboard/trafficChart/trafficChart.html
index 775df6ff..3b5f55ec 100644
--- a/src/app/pages/dashboard/trafficChart/trafficChart.html
+++ b/src/app/pages/dashboard/trafficChart/trafficChart.html
@@ -14,7 +14,7 @@
 
   <div class="channels-info">
     <div>
-      <div class="channels-info-item" *ngFor="#item of doughnutData">
+      <div class="channels-info-item" *ngFor="let item of doughnutData">
         <div class="legend-color" [ngStyle]="{'background-color': item.color }"></div>
         <p>{{ item.label }}<span class="channel-number">+{{ item.percentage }}%</span></p>
         <div class="progress progress-sm channel-progress">
diff --git a/src/app/theme/components/msgCenter/msgCenter.html b/src/app/theme/components/msgCenter/msgCenter.html
index 1287eba7..75240934 100644
--- a/src/app/theme/components/msgCenter/msgCenter.html
+++ b/src/app/theme/components/msgCenter/msgCenter.html
@@ -15,7 +15,7 @@
         <a href>Settings</a>
       </div>
       <div class="msg-list">
-        <a *ngFor="#msg of notifications" href class="clearfix">
+        <a *ngFor="let msg of notifications" href class="clearfix">
           <div class="img-area"><img [ngClass]="{'photo-msg-item': !msg.image}"
                                      src="{{ ( msg.image ||  (msg.name | profilePicture)) }}"></div>
           <div class="msg-area">
@@ -40,7 +40,7 @@
         <a href>Settings</a>
       </div>
       <div class="msg-list">
-        <a *ngFor="#msg of messages" href class="clearfix">
+        <a *ngFor="let msg of messages" href class="clearfix">
           <div class="img-area"><img [ngClass]="{'photo-msg-item': !msg.image}"
                                      src="{{ ( msg.image ||  (msg.name | profilePicture)) }}"></div>
           <div class="msg-area">
diff --git a/src/app/theme/components/sidebar/sidebar.html b/src/app/theme/components/sidebar/sidebar.html
index 8a81fd25..a07d0217 100644
--- a/src/app/theme/components/sidebar/sidebar.html
+++ b/src/app/theme/components/sidebar/sidebar.html
@@ -1,6 +1,6 @@
 <aside class="al-sidebar" (mouseleave)="hoverElemTop=outOfArea">
   <ul class="al-sidebar-list">
-    <li *ngFor="#item of menuItems" class="al-sidebar-list-item"
+    <li *ngFor="let item of menuItems" class="al-sidebar-list-item"
         [ngClass]="{'selected': item.selected, 'with-sub-menu': item.subMenu}">
 
       <a *ngIf="!item.subMenu" [routerLink]="[item.name]" class="al-sidebar-list-link">
@@ -16,7 +16,7 @@
 
       <ul *ngIf="item.subMenu" class="al-sidebar-sublist"
           [ngClass]="{expanded: item.expanded, 'slide-right': item.slideRight}">
-        <li *ngFor="#subitem of item.subMenu"
+        <li *ngFor="let subitem of item.subMenu"
             [ngClass]="{'selected': subitem.selected, 'with-sub-menu': subitem.subMenu}">
           <a (mouseenter)="hoverItem($event, item)" *ngIf="subitem.subMenu" (click)="toggleSubMenu($event, subitem);"
              class="al-sidebar-list-link subitem-submenu-link"><span>{{ subitem.title }}</span>
@@ -25,7 +25,7 @@
           </a>
           <ul *ngIf="subitem.subMenu" class="al-sidebar-sublist subitem-submenu-list"
               [ngClass]="{expanded: subitem.expanded, 'slide-right': subitem.slideRight}">
-            <li *ngFor="#subSubitem of subitem.subMenu" (mouseenter)="hoverItem($event, item)"
+            <li *ngFor="let subSubitem of subitem.subMenu" (mouseenter)="hoverItem($event, item)"
                 [ngClass]="{selected: subitem.selected}">
               <a (mouseenter)="hoverItem($event, item)" [routerLink]="[item.name, subitem.name, subSubitem.name]">
                 {{ subSubitem.title }}</a>