Merge branch 'master' into cleanup

resources/frontend_client/app/auth/partials/password_reset.html

@@ -5,7 +5,7 @@
 
     <div class="row">
         <form novalidate>
-            <p class="text-grey-4 px2">Your new password must be <b>10 characters</b> or longer, and <b>include an uppercase letter</b> and <b>a punctuation mark</b>. We know it's a bit much, but security is what the cool kids care about.</p>
+            <p class="text-grey-4 px2">Your new password must be <b>8 characters</b> or longer, and <b>include an uppercase letter</b>, <b>a punctuation mark</b>, and <b>a digit</b>. We know it's a bit much, but security is what the cool kids care about.</p>
 
             <alert class="Form-group alert mx2" type="error" ng-if="error">{{error}}</alert>
 
@@ -35,4 +35,4 @@
         Your password has been changed.
         <a class="link" href="/auth/login">Sign in with your new password.</a>
     </p>
-</div>
\ No newline at end of file
+</div>