Reset password
Merge branch 'master' into sign-in

Conflicts:
	app/mailers/mailer.rb
	app/views/mailer/reset_password_email.html.erb
	config/locales/pl.yml
	config/locales/test.yml
Signout and header