add password reset
Merge branch 'master' of https://github.com/jccf091/myflix

Conflicts:
	app/controllers/forgot_password_controller.rb
	app/mailers/user_mailer.rb
	config/routes.rb
	spec/controllers/forgot_password_controller_spec.rb