Merge with developer brunch

src/app/pages/login/login.page.ts

@@ -62,11 +62,11 @@ export class LoginPage implements OnInit {
     await alert.present();
   }
 
-  loginRocketChat(user: any) {
+  loginRocketChat() {
 
     let postData = {
-      "user": user.username,
-      "password": user.password,
+      "user": this.username,
+      "password": this.password,
     }
     this.authService.loginChat(postData).subscribe((res: any) => {
       console.log(res.data);
@@ -130,8 +130,8 @@ export class LoginPage implements OnInit {
         BasicAuthKey: ""
       }
       if (await this.authService.login(this.userattempt)) {
-        /* this.loginRocketChat(); */
-        this.storeUserIdANdToken()
+        this.loginRocketChat();
+        this.storeUserIdANdToken();
 
         this.router.navigate(['/home/events']);
       }