updated gems
more gem dependencies
changes to support devise 3.2.x
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  updating gems

Conflicts:
	Gemfile.lock
Merge pull request #312 from fusion94/master

changes to support devise 3.2.x