Update main Gemfile dependencies.
Update 3-2-stable Gemfile dependencies.
Update 4-0-stable Gemfile dependencies.
Update Rails HEAD Gemfile dependencies.
Update Travis config to test on ruby 2.1.1 instead of 2.1.0
split send_reset_password_instructions into two parts for better hooking
rename method + remove extra db call
Merge pull request #3013 from aditya-kapoor/split-send_reset_password_instructions

Split send_reset_password_instructions for better hooking
Merge branch 'master' of github.com:plataformatec/devise into make-devise-more-engine-friendly

Conflicts:
	.travis.yml
	Gemfile.lock