Merge pull request #2288 from hypothesis/username-or-email-address

Ask for "Username or email address" when logging in

h/templates/client/auth.html

@@ -18,7 +18,7 @@
     </p>
 
     <div class="form-field">
-      <label class="form-label" for="field-login-username">Username:</label>
+      <label class="form-label" for="field-login-username">Username or email address:</label>
       <input class="form-input" type="text" id="field-login-username"
              name="username" value=""
              ng-model="model.username" ng-minlength="3"
@@ -26,7 +26,7 @@
       <ul class="form-error-list">
         <li class="form-error"
             ng-show="login.username.$error.required"
-            >Please enter your username.</li>
+            >Please enter your username or email address.</li>
         <li class="form-error"
             ng-show="login.username.$error.minlength"
             >Usernames are at least 3 characters.</li>