Merge branch 'master' into issue-2691

Author: Awk34

Diff for: src/generators/app/index.js

@@ -522,6 +522,7 @@ export class Generator extends Base {
             return contents
               .replace(/confirmpassword/g, 'confirmPassword')
               .replace(/loginform/g, 'loginForm')
+              .replace(/changepasswordform/g, 'changePasswordForm')
               .replace(/newpassword/g, 'newPassword')
               .replace(/ngif/g, 'ngIf')
               .replace(/ngfor/g, 'ngFor')

Diff for: templates/app/_package.json

@@ -45,7 +45,7 @@
     "passport-google-oauth20": "^1.0.0",<% } %><% if(filters.ws) { %>
     "primus": "^7.0.1",
     "primus-emit": "^1.0.0",
-    "uws": "^10.148.0",<% } %>
+    "uws": "10.148.1",<% } %>
     "serve-favicon": "^2.3.0"
   },
   "devDependencies": {

Diff for: templates/app/client/app/account(auth)/settings/settings.html

@@ -4,7 +4,7 @@
       <h1>Change Password</h1>
     </div>
     <div class="col-sm-12">
-      <form class="form" name="form" (ngSubmit)="changePassword()" novalidate>
+      <form class="form" name="changePasswordForm" (ngSubmit)="changePassword(changePasswordForm)" novalidate #changePasswordForm="ngForm">
 
         <div class="form-group">
           <label>Current Password</label>