update with changes from Production branch

app/views/mailer/password_reset.html.erb

@@ -5,13 +5,13 @@
   </head>
   <body>
     <p>
-			<%= t(:password_reset_message1) %>
-			<br />
-			<%= t(:password_reset_message2) %>
-			<br />
-			<%= t(:password_reset_message3) %>
-			<br /><br />
-			<a href="<%= @webpage %>"><%= @webpage %></a>
+      <%= t(:password_reset_message1) %>
+      <br />
+      <%= t(:password_reset_message2) %>
+      <br />
+      <%= t(:password_reset_message3) %>
+      <br /><br />
+      <a href="<%= @webpage %>"><%= @webpage %></a>
     </p>
   </body>
 </html>