Merge pull request #312 from fusion94/master

changes to support devise 3.2.x