Bump devise up to 3.2.4
Merge branch 'upgrade-devise-to-3.2.4'

Conflicts:
	Gemfile.lock