Ensure that kandan is using a version of Devise that supports :token_authenticatable Fixes #295
Merge branch 'kandan-295' of git://github.com/fmendez/kandan into fmendez-kandan-295

* 'kandan-295' of git://github.com/fmendez/kandan:
  Ensure that kandan is using a version of Devise that supports :token_authenticatable Fixes #295

Conflicts:
	Gemfile.lock