Merge branch 'master' into develop

app/lang/en/reminders.php

@@ -13,10 +13,10 @@ return array(
 	|
 	*/
 
-	"password" => "Passwords must be six characters and match the confirmation.",
+	"password" => "Passwords must be at least six characters long and match the confirmation.",
 
 	"user"     => "We can't find a user with that e-mail address.",
 
 	"token"    => "This password reset token is invalid.",
 
-);
+);
\ No newline at end of file

public/.htaccess

@@ -2,7 +2,7 @@
     Options -MultiViews
     RewriteEngine On
 
-	RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteRule ^ index.php [L]
-</IfModule>
+</IfModule>
\ No newline at end of file