Merge branch 'new_copy' of github.com:mozilla/browserid into new_copy

Conflicts:
	resources/static/dialog/views/set_password.ejs

resources/static/dialog/views/set_password.ejs

@@ -16,7 +16,6 @@
 
 
           <li>
-
               <% if (password_reset) { %>
                 <label for="password"><%= format(gettext("Create a new password to use with %s."), ["Persona"]) %></label>
               <% } else { %>
@@ -55,7 +54,7 @@
 
       <p class="submit cf buttonrow">
           <button id="<%= password_reset ? "password_reset" : "verify_user" %>">
-            <%= password_reset ? gettext('reset password') : gettext('done') %>
+            <%= (password_reset ? gettext('reset password') : gettext('done')) %>
           </button>
 
           <% if(cancelable) { %>