update devise to 3.2
Merge pull request #4511 from MrZYX/bump_devise

update devise to 3.2
Merge branch 'develop' into social.mrzyx.de

Conflicts:
	Gemfile.lock