recovery fix
Merge branch 'master' of https://github.com/Len0/nwt-op

Conflicts:
	app/controllers/password_recovery_tokens_controller.rb