Merge branch 'master' into develop

resources/lang/en/reminders.php

@@ -21,4 +21,6 @@ return array(
 
 	"sent" => "Password reminder sent!",
 
+	"reset" => "Password has been reset!",
+
 );