Create confirmation_instructions.cat.html.erb
Update confirmation_instructions.cat.html.erb
Create reset_password_instructions.cat.html.erb
Update reset_password_instructions.es.html.erb
Create unlock_instructions.cat.html.erb
merge branch 'master' into defect_and_literals_to_locale