Updates devise after security advisory
Merge branch 'production'

Conflicts:
	Gemfile.lock
Merge branch 'master' into faster-coffee