updated devise gem
Merge branch 'master' of https://github.com/emorystrother/git_help

Conflicts:
	Gemfile
	Gemfile.lock
MZ trying to resolve conflicts